From 24c576815a0a51c4484a1720bea615d93430dfc4 Mon Sep 17 00:00:00 2001
From: Diogo Bastos <diogo.bastos@hyland.com>
Date: Wed, 17 Apr 2024 15:07:04 +0100
Subject: [PATCH] AAE-21393 Fix amount form widget style

---
 .../lib/form/components/widgets/amount/amount.widget.html | 8 ++++----
 .../lib/form/components/widgets/amount/amount.widget.scss | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/core/src/lib/form/components/widgets/amount/amount.widget.html b/lib/core/src/lib/form/components/widgets/amount/amount.widget.html
index 0c4752416b..0e486dbfec 100644
--- a/lib/core/src/lib/form/components/widgets/amount/amount.widget.html
+++ b/lib/core/src/lib/form/components/widgets/amount/amount.widget.html
@@ -1,18 +1,18 @@
 <div class="adf-amount-widget__container adf-amount-widget {{field.className}}"
        [class.adf-invalid]="!field.isValid && isTouched()" [class.adf-readonly]="field.readOnly"
        [class.adf-left-label-input-container]="field.leftLabels">
-       <div>
-              <label class="adf-label"
-                     [class.adf-left-label]="field.leftLabels" [attr.for]="field.id">{{field.name | translate }}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
+       <div *ngIf="field.leftLabels">
+              <label class="adf-label adf-left-label" [attr.for]="field.id">{{field.name | translate }}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
        </div>
        <div>
               <mat-form-field class="adf-amount-widget__input" [hideRequiredMarker]="true">
-                     <span matTextPrefix class="adf-amount-widget__prefix-spacing">{{ currency }} &nbsp;</span>
+                     <label class="adf-label" *ngIf="!field.leftLabels" [attr.for]="field.id">{{field.name | translate }}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
                      <input matInput [matTooltip]="field.tooltip" matTooltipPosition="above" matTooltipShowDelay="1000"
                             class="adf-input" type="text" [id]="field.id" [required]="isRequired()"
                             [placeholder]="placeholder" [value]="field.value" [(ngModel)]="field.value"
                             (ngModelChange)="onFieldChanged(field)" [disabled]="field.readOnly"
                             (blur)="markAsTouched()">
+                     <span matTextPrefix class="adf-amount-widget__prefix-spacing">{{ currency }} &nbsp;</span>
               </mat-form-field>
               <error-widget [error]="field.validationSummary"></error-widget>
               <error-widget *ngIf="isInvalidFieldRequired() && isTouched()"
diff --git a/lib/core/src/lib/form/components/widgets/amount/amount.widget.scss b/lib/core/src/lib/form/components/widgets/amount/amount.widget.scss
index 54521bf5ee..175fea3bf9 100644
--- a/lib/core/src/lib/form/components/widgets/amount/amount.widget.scss
+++ b/lib/core/src/lib/form/components/widgets/amount/amount.widget.scss
@@ -1,7 +1,6 @@
 /* stylelint-disable selector-class-pattern */
 @import 'styles/mat-selectors';
 
-
 .adf {
     &-amount-widget {
         width: 100%;
@@ -19,6 +18,12 @@
             transition: none;
         }
 
+        #{$mat-form-field-prefix} {
+            padding-top: 16px;
+            padding-bottom: 16px;
+            align-self: flex-end;
+        }
+
         &:not(#{$mat-focused}):not(#{$mat-form-field-invalid}) {
             .adf-amount-widget__prefix-spacing {
                 color: var(--adf-theme-foreground-secondary-text-color);