chore(bridge-ui-v2): Update isBridgePaused method (#15339)

taikoxyz · Dec 6, 2023 · 72eb781 · 72eb781
1 parent b3b9474
commit 72eb781
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 31 deletions.
diff --git a/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte b/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte
@@ -37,29 +37,27 @@
 
   export let allTokensApproved = false;
 
-  function onApproveClick() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
-    });
+  let paused = false;
 
+  function onApproveClick() {
+    if (paused) throw new BridgePausedError('Bridge is paused');
     approving = true;
     approve().finally(() => {
       approving = false;
     });
   }
 
   function onBridgeClick() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
-    });
+    if (paused) throw new BridgePausedError('Bridge is paused');
     bridging = true;
     bridge();
   }
 
   //TODO: this should probably be checked somewhere else?
   export async function checkTokensApproved() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((result) => {
+      paused = result;
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
     $validatingAmount = true;
     if ($selectedToken?.type === TokenType.ERC721 || $selectedToken?.type === TokenType.ERC1155) {
@@ -178,7 +176,7 @@
     $selectedToken &&
     !$validatingAmount &&
     !$insufficientBalance &&
-    !isBridgePaused();
+    !paused;
 
   $: erc20ConditionsSatisfied =
     !canDoNothing && !$insufficientAllowance && commonConditions && $tokenBalance && $enteredAmount;

diff --git a/packages/bridge-ui-v2/src/components/Bridge/Bridge.svelte b/packages/bridge-ui-v2/src/components/Bridge/Bridge.svelte
@@ -82,8 +82,8 @@
   }
 
   async function approve() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
     try {
       if (!$selectedToken || !$network || !$destinationChain) return;
@@ -147,8 +147,8 @@
   }
 
   async function bridge() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
     if (!$bridgeService || !$selectedToken || !$network || !$destinationChain || !$account?.address) return;
 

diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte
@@ -173,8 +173,8 @@
   };
 
   const manualImportAction = () => {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
     if (!$network?.id) throw new Error('network not found');
     const srcChainId = $network?.id;

diff --git a/packages/bridge-ui-v2/src/components/Transactions/Status.svelte b/packages/bridge-ui-v2/src/components/Transactions/Status.svelte
@@ -79,8 +79,8 @@
   }
 
   async function claim() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
     if (!$network || !$account?.address) return;
 
@@ -169,8 +169,8 @@
   }
 
   async function release() {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
     if (!$network || !$account?.address) return;
 

diff --git a/packages/bridge-ui-v2/src/libs/bridge/ERC20Bridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ERC20Bridge.ts
@@ -69,8 +69,8 @@ export class ERC20Bridge extends Bridge {
   }
 
   async estimateGas(args: ERC20BridgeArgs) {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
 
     const { tokenVaultContract, sendERC20Args } = await ERC20Bridge._prepareTransaction(args);
@@ -88,8 +88,8 @@ export class ERC20Bridge extends Bridge {
   }
 
   async requireAllowance({ amount, tokenAddress, ownerAddress, spenderAddress }: RequireAllowanceArgs) {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
 
     const tokenContract = getContract({

diff --git a/packages/bridge-ui-v2/src/libs/bridge/ERC721Bridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ERC721Bridge.ts
@@ -33,8 +33,8 @@ export class ERC721Bridge extends Bridge {
   }
 
   async requiresApproval({ tokenAddress, spenderAddress, tokenId }: RequireApprovalArgs) {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
 
     const tokenContract = getContract({
@@ -50,8 +50,8 @@ export class ERC721Bridge extends Bridge {
   }
 
   async estimateGas(args: ERC721BridgeArgs): Promise<bigint> {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
 
     const { tokenVaultContract, sendERC721Args } = await ERC721Bridge._prepareTransaction(args);

diff --git a/packages/bridge-ui-v2/src/libs/bridge/ETHBridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ETHBridge.ts
@@ -77,8 +77,8 @@ export class ETHBridge extends Bridge {
   }
 
   async bridge(args: ETHBridgeArgs) {
-    isBridgePaused().then(() => {
-      throw new BridgePausedError('Bridge is paused');
+    isBridgePaused().then((paused) => {
+      if (paused) throw new BridgePausedError('Bridge is paused');
     });
 
     const { bridgeContract, message } = await ETHBridge._prepareTransaction(args);

diff --git a/packages/bridge-ui-v2/src/libs/util/checkForPausedContracts.ts b/packages/bridge-ui-v2/src/libs/util/checkForPausedContracts.ts
@@ -1,4 +1,5 @@
 import { getContract } from '@wagmi/core';
+import { get } from 'svelte/store';
 
 import { bridgeABI } from '$abi';
 import { routingContractsMap } from '$bridgeConfig';
@@ -10,7 +11,7 @@ const log = getLogger('bridge:checkForPausedContracts');
 
 export const isBridgePaused = async () => {
   await checkForPausedContracts();
-  if (bridgePausedModal) {
+  if (get(bridgePausedModal)) {
     return true;
   }
   return false;