diff --git a/tauri-wallet/src/routes/send/validationSchema.ts b/tauri-wallet/src/routes/send/validationSchema.ts index 15008ff78e..cde14baf11 100644 --- a/tauri-wallet/src/routes/send/validationSchema.ts +++ b/tauri-wallet/src/routes/send/validationSchema.ts @@ -6,6 +6,6 @@ export const validationSchema = Yup.object().shape({ amount: Yup.string() .required() .test('valid-amount', 'A valid amount is required', (amount) => { - return validateAmount(amount || '0', '1') + return validateAmount(amount || '0', '0') }), }) diff --git a/tauri-wallet/src/utils/index.ts b/tauri-wallet/src/utils/index.ts index e5d8b6944f..19c23454df 100644 --- a/tauri-wallet/src/utils/index.ts +++ b/tauri-wallet/src/utils/index.ts @@ -20,15 +20,16 @@ export const validateAmount = async ( minimum: string ): Promise => { // tests basic coin value requirements, like no more than 6 decimal places, value lower than total supply, etc - if (!basicRawCoinValueValidation(amount)) { - return false - } try { const minorValueStr: Coin = await invoke('major_to_minor', { amount, }) + if (!basicRawCoinValueValidation(minorValueStr.amount)) { + return false + } + const minorValue = parseInt(minorValueStr.amount) return minorValue >= parseInt(minimum) @@ -44,7 +45,7 @@ export const basicRawCoinValueValidation = (rawAmount: string): boolean => { if (!Number(rawAmount)) { return false } - + debugger const amountFloat = parseFloat(rawAmount) // it cannot have more than 6 decimal places