try to fix prefill amount and add to else case (#505)

Mintbase · Sep 4, 2023 · 6ac984f · 6ac984f · vercel · Sep 4, 2023
1 parent c8f6cf7
commit 6ac984f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/inputs/amount-account-input/AmountAccountInput.tsx b/src/components/inputs/amount-account-input/AmountAccountInput.tsx
@@ -68,12 +68,13 @@ export const MbAmountAccountInput = ({
           controlStatus={
             isCleared || !amount
               ? EControlStatus.NORMAL
-              : isAmountValid
+              : isAmountValid || amount === '1'
               ? EControlStatus.VALID
               : EControlStatus.INVALID
           }
           onChange={handleAmountDebounceFor500}
           hasPercentageLabel={isPercentage}
+          disabled={amount === '1'}
           defaultValue={amount === '1' ? 1 : undefined}
         />
       </div>

diff --git a/src/components/inputs/input-account/near-amount-account/NearAmountAccount.tsx b/src/components/inputs/input-account/near-amount-account/NearAmountAccount.tsx
@@ -378,7 +378,8 @@ export const MbNearAmountAccount = ({
                           controlStatus={defaultAmountStatus(amount.value)}
                           disabled
                           hasPercentageLabel={isPercentage}
-                          value={amount.value}
+                          value={totalAmount !== 1 ? amount.value : undefined}
+                          defaultValue={totalAmount === 1 ? 1 : undefined}
                         />
                       </div>
                       <MbInput

diff --git a/src/components/inputs/input-field/inputField.tsx b/src/components/inputs/input-field/inputField.tsx
@@ -83,7 +83,7 @@ export const MbInput = forwardRef<HTMLInputElement, InputProps>(
               ref={ref}
               placeholder={placeholder}
               type={type}
-              value={value}
+              value={!defaultValue ? value : undefined}
               maxLength={maxChars}
               required={required}
               defaultValue={defaultValue}