Merge pull request #962 from liquality/fix/login-for-min-send-amount

fix: modified login to validate min send amount for solana and btc

Author: bradleySuira

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.81.4",
+  "version": "0.81.5",
   "private": true,
   "author": "Liquality <info@liquality.io>",
   "scripts": {

src/main.js

@@ -6,9 +6,12 @@ import router from './router'
 import { Localization } from './utils/localization'
 import ToggleButton from 'vue-js-toggle-button'
 import VTooltip from 'v-tooltip'
-
 import '@/assets/scss/style.scss'
 
+if (process.env.NODE_ENV === 'development' && process.env.VUE_APP_USE_VUE_DEV_TOOLS) {
+  devtools.connect()
+}
+
 Vue.use(ToggleButton)
 Vue.use(VTooltip)
 Vue.config.productionTip = false
@@ -20,6 +23,3 @@ new Vue({
   render: (h) => h(App)
 }).$mount('#app')
 
-if (process.env.NODE_ENV === 'development' && process.env.VUE_APP_USE_VUE_DEV_TOOLS === true) {
-  devtools.connect()
-}

src/manifest.json

@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.81.4",
+  "version": "0.81.5",
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",

src/views/Send/Send.vue

@@ -8,11 +8,11 @@
       >
         {{ $t('common.send') }}
       </NavBar>
-      <InfoNotification v-if="nativeAssetRequired || !isValidSendAmount">
-        <EthRequiredMessage v-if="nativeAssetRequired" :account-id="account.id" :action="'send'" />
-        <template v-else>
-          {{ `${$t('common.minSendAmount')} ${minimumAssetSendAmount} ${asset}` }}
-        </template>
+      <!-- <InfoNotification v-if="nativeAssetRequired">
+        <EthRequiredMessage :account-id="account.id" :action="'send'" />
+      </InfoNotification> -->
+      <InfoNotification v-if="!isValidSendAmount">
+        {{ `${$t('common.minSendAmount')} ${minimumAssetSendAmount} ${asset}` }}
       </InfoNotification>
       <div class="wrapper form">
         <div class="wrapper_top">
@@ -23,7 +23,7 @@
             :amount-fiat="amountFiat"
             @update:amount="(newAmount) => (amount = newAmount)"
             @toggle-max="toggleMaxAmount"
-            @update:amountFiat="updateSendAmount"
+            @update:amountFiat="(newAmount) => (amountFiat = newAmount)"
             :max="available"
             :available="available"
             :max-fiat="prettyFiatBalance(available, fiatRates[asset])"
@@ -131,7 +131,7 @@
               class="btn btn-primary btn-lg"
               id="send_review_button"
               @click="review"
-              :disabled="!canSend || !isValidSendAmount"
+              :disabled="!canSend"
             >
               {{ $t('common.review') }}
             </button>
@@ -289,7 +289,7 @@ import { UNSResolver } from '@liquality/wallet-core/dist/src/nameResolvers/uns'
 import { errorToLiqualityErrorString } from '@liquality/error-parser/dist/src/utils'
 import { reportLiqualityError } from '@liquality/error-parser/dist/src/reporters/index'
 import InfoNotification from '@/components/InfoNotification'
-import EthRequiredMessage from '@/components/EthRequiredMessage'
+// import EthRequiredMessage from '@/components/EthRequiredMessage'
 
 export default {
   components: {
@@ -303,7 +303,7 @@ export default {
     CustomFees,
     CustomFeesEIP1559,
     InfoNotification,
-    EthRequiredMessage
+    // EthRequiredMessage
   },
   mixins: [ledgerConnectMixin],
   data() {
@@ -351,19 +351,23 @@ export default {
       return this.account?.balances
     },
     minimumAssetSendAmount() {
-      return this.minimumAssetsSendAmounts[this.asset] || 0
+      return this.minimumAssetsSendAmounts[this.asset] || 0.0
     },
     isValidSendAmount() {
-      return this.stateAmount >= this.minimumAssetSendAmount
+      const amount = BN(this.stateAmount)
+      if (amount.eq(0)) {
+        debugger
+        return true
+      }
+      debugger
+      return amount.gte(BN(this.minimumAssetSendAmount))
     },
     amount: {
       get() {
-        return this.stateAmount
+        return this.stateAmount // crypto value
       },
       set(newValue) {
-        this.$nextTick(() => {
-          this.updateSendAmount(newValue)
-        })
+        this.updateSendAmount(newValue)
       }
     },
     amountFiat: {
@@ -374,14 +378,14 @@ export default {
         if (!newValue) {
           // keep it as a number instead of string, otherwise the placeholder of input won't appear
           this.stateAmountFiat = 0.0
-          this.stateAmount = 0.0
         } else {
           this.stateAmountFiat = newValue
-          this.stateAmount = fiatToCrypto(
-            this.stateAmountFiat?.replaceAll(',', ''),
-            this.fiatRates[this.asset]
-          )
         }
+
+        this.stateAmount = fiatToCrypto(
+          this.stateAmountFiat?.replaceAll(',', ''),
+          this.fiatRates[this.asset]
+        )
       }
     },
     balance() {
@@ -470,6 +474,7 @@ export default {
         !this.nativeAssetRequired &&
         this.address &&
         !this.addressError &&
+        BN(this.amount).gte(BN(this.minimumAssetSendAmount)) &&
         BN(this.amount).gt(0) &&
         !this.amountError
       ) {
@@ -538,7 +543,7 @@ export default {
       if (newValue && !isNaN(newValue)) {
         this.stateAmount = newValue
       } else {
-        this.stateAmount = this.minimumAssetSendAmount
+        this.stateAmount = 0.0
       }
       this.stateAmountFiat = prettyFiatBalance(this.stateAmount, this.fiatRates[this.asset])
     },
@@ -743,11 +748,6 @@ export default {
         label: `${this.asset}`
       }
     })
-
-    //  Set Asset minimum send Amount
-    this.$nextTick(() => {
-      this.stateAmount = this.minimumAssetSendAmount || 0.0
-    })
   },
   watch: {
     selectedFee: {