diff --git a/package.json b/package.json index 76b9512f1..e5ea357f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "liquality-wallet", - "version": "0.83.0", + "version": "0.83.1", "private": true, "author": "Liquality ", "scripts": { diff --git a/src/manifest.json b/src/manifest.json index f1ee15b76..50050d886 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "manifest_version": 2, - "version": "0.83.0", + "version": "0.83.1", "name": "__MSG_appName__", "description": "__MSG_appDesc__", "default_locale": "en", diff --git a/src/views/Send/Send.vue b/src/views/Send/Send.vue index 8a377faab..a744529ed 100644 --- a/src/views/Send/Send.vue +++ b/src/views/Send/Send.vue @@ -9,7 +9,10 @@ {{ $t('common.send') }} - + {{ $t('components.noFundsForNetworkFee.noEnoughAsset', { asset: assetChain }) }} + + {{ $t('common.get') }} {{ assetChain }} + {{ `${$t('common.minSendAmount')} ${minimumAssetSendAmount} ${asset}` }} @@ -290,7 +293,6 @@ 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' export default { components: { @@ -303,8 +305,7 @@ export default { LedgerSignRequestModal, CustomFees, CustomFeesEIP1559, - InfoNotification, - EthRequiredMessage + InfoNotification }, mixins: [ledgerConnectMixin], data() { @@ -351,6 +352,9 @@ export default { ...mapState(['activeNetwork', 'activeWalletId', 'fees', 'fiatRates']), ...mapGetters('app', ['ledgerBridgeReady']), ...mapGetters(['accountItem', 'client', 'suggestedFeePrices']), + accountUrl() { + return `/accounts/${this.accountId}/${this.nativeAsset}/receive` + }, account() { return this.accountItem(this.accountId) }, @@ -470,12 +474,14 @@ export default { return true } - const nativeAssetBalance = this.networkWalletBalances[this.assetChain] - if ( - !nativeAssetBalance || - BN(nativeAssetBalance).lte(0) || - BN(nativeAssetBalance).minus(BN(this.currentFee)).lt(0) - ) { + const balance = this.networkWalletBalances[this.assetChain] + + if (!balance) { + return true + } + + const nativeAssetBalance = unitToCurrency(cryptoassets[this.assetChain], BN(balance)) + if (nativeAssetBalance.lte(0) || nativeAssetBalance.minus(BN(this.currentFee)).lte(0)) { return true } return false @@ -552,6 +558,7 @@ export default { getAssetIcon, getAssetColorStyle, shortenAddress, + getNativeAsset, updateSendAmount(newValue) { if (newValue && !isNaN(newValue)) { this.stateAmount = newValue diff --git a/src/views/Send/SendNFT.vue b/src/views/Send/SendNFT.vue index 3d86e525e..0939ee994 100644 --- a/src/views/Send/SendNFT.vue +++ b/src/views/Send/SendNFT.vue @@ -683,7 +683,7 @@ export default { ]).finally(() => { setTimeout(() => { this.updatingFees = false - }, 1000); + }, 1000) }) } }