Merge fixes from release 1.17.0 (#1097)

* Fix transaction view balance check (#1095) * fix ui checks * fix computed * Fix bridge external decimals (#1096) * fix ui checks * fix computed * fix check
sora-xor · Jul 10, 2023 · fa6d7f7 · fa6d7f7
1 parent b340cab
commit fa6d7f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/store/assets/actions.ts b/src/store/assets/actions.ts
@@ -21,7 +21,8 @@ async function getEthRegisteredAssets(context: ActionContext<any, any>): Promise
   for (const asset of networkAssets) {
     const soraAddress = asset.address;
     const address = asset.externalAddress || (await rootDispatch.web3.getEvmTokenAddressByAssetId(soraAddress));
-    const decimals = +asset.externalDecimals ?? (await ethersUtil.getAssetDecimals(address));
+    // [TODO] fix js-lib: externalDecimals = 0 by default, what could be with nft
+    const decimals = +asset.externalDecimals || (await ethersUtil.getAssetDecimals(address));
 
     registeredAssets.push({
       [soraAddress]: {

diff --git a/src/views/BridgeTransaction.vue b/src/views/BridgeTransaction.vue
@@ -390,15 +390,18 @@ export default class BridgeTransaction extends Mixins(
 
     if (!this.asset || !this.amount || !fee) return false;
 
-    return hasInsufficientBalance(this.asset, this.amount, fee, !this.isSoraToEvm);
+    return this.txIsUnsigned && hasInsufficientBalance(this.asset, this.amount, fee, !this.isSoraToEvm);
   }
 
   get isInsufficientXorForFee(): boolean {
-    return hasInsufficientXorForFee(this.xor, this.txSoraNetworkFee);
+    return this.txIsUnsigned && hasInsufficientXorForFee(this.xor, this.txSoraNetworkFee);
   }
 
   get isInsufficientEvmNativeTokenForFee(): boolean {
-    return hasInsufficientEvmNativeTokenForFee(this.externalBalance, this.txEvmNetworkFee);
+    return (
+      ((this.txIsUnsigned && !this.isSoraToEvm) || (!this.txIsUnsigned && this.isSoraToEvm)) &&
+      hasInsufficientEvmNativeTokenForFee(this.externalBalance, this.txEvmNetworkFee)
+    );
   }
 
   get isAnotherEvmAddress(): boolean {