Fix/error handling bridge (#2223)

Co-authored-by: miguelmtzinf <miguelmtz.mail@gmail.com>
aave · Oct 22, 2024 · fe9d368 · fe9d368 · github-actions · Oct 22, 2024
1 parent 438635f
commit fe9d368
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/src/components/transactions/Bridge/BridgeConfig.ts b/src/components/transactions/Bridge/BridgeConfig.ts
@@ -135,14 +135,14 @@ const testnetConfig: Config[] = [
     sourceChainId: ChainId.sepolia,
     lockReleaseTokenPool: '0x7768248E1Ff75612c18324bad06bb393c1206980',
     chainSelector: '16015286601757825753',
-    router: '0x11c008349c41fb5c78e544397fb4613605ec1a74',
+    router: '0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59',
     tokenOracle: '0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051', // mock oracle
     wrappedNativeOracle: AaveV3Sepolia.ASSETS.WETH.ORACLE,
     subgraphUrl: 'https://api.studio.thegraph.com/query/75867/gho-ccip-sepolia/version/latest',
     destinations: [
       {
         destinationChainId: ChainId.arbitrum_sepolia,
-        onRamp: '0x1f41c443cf68750d5c195e2ea7051521d981fc77',
+        onRamp: '0xBc09627e58989Ba8F1eDA775e486467d2A00944F',
       },
     ],
     feeTokens: [
@@ -179,14 +179,14 @@ const testnetConfig: Config[] = [
     sourceChainId: ChainId.arbitrum_sepolia,
     burnMintTokenPool: '0x3eC2b6F818B72442fc36561e9F930DD2b60957D2',
     chainSelector: '3478487238524512106',
-    router: '0x22356aec4cf05ec0ec63daa576c6b2ce1dc64701',
-    tokenOracle: '0x2a9C5afB0d0e4BAb2BCdaE109EC4b0c4Be15a165', // mock oracle
+    router: '0x2a9C5afB0d0e4BAb2BCdaE109EC4b0c4Be15a165',
+    tokenOracle: '0x1f885520b7BD528E46b390040F12E753Dce43004', // mock oracle
     wrappedNativeOracle: AaveV3ArbitrumSepolia.ASSETS.WETH.ORACLE,
     subgraphUrl: 'https://api.studio.thegraph.com/query/75867/gho-ccip-arb-sepolia/version/latest',
     destinations: [
       {
         destinationChainId: ChainId.sepolia,
-        onRamp: '0xc1ebd046a4086142479be3fc16a4791e2022909a',
+        onRamp: '0x64d78F20aD987c7D52FdCB8FB0777bD00de53210',
       },
     ],
     feeTokens: [

diff --git a/src/components/transactions/Bridge/BridgeModalContent.tsx b/src/components/transactions/Bridge/BridgeModalContent.tsx
@@ -141,6 +141,7 @@ export const BridgeModalContent = () => {
     bridgeFeeFormatted,
     loading: loadingBridgeMessage,
     latestAnswer: bridgeFeeUSD,
+    error: txErrorBridgeMessage,
   } = useGetBridgeMessage({
     sourceChainId: sourceNetworkObj.chainId,
     destinationChainId: destinationNetworkObj?.chainId || 0,
@@ -608,6 +609,14 @@ export const BridgeModalContent = () => {
           </TxModalDetails>
           {txError && <GasEstimationError txError={txError} />}
 
+          {txErrorBridgeMessage && (
+            <Warning severity="error" sx={{ mt: 4 }} icon={false}>
+              <Typography variant="caption">
+                <Trans>Something went wrong fetching bridge message, please try again later.</Trans>
+              </Typography>
+            </Warning>
+          )}
+
           {/* {bridgeLimitExceeded && (
             <Warning severity="error" sx={{ mt: 4 }} icon={false}>
               <Typography variant="caption">

diff --git a/src/components/transactions/Bridge/useGetBridgeMessage.tsx b/src/components/transactions/Bridge/useGetBridgeMessage.tsx
@@ -31,6 +31,7 @@ export const useGetBridgeMessage = ({
   const [bridgeFeeFormatted, setBridgeFeeFormatted] = useState('');
   const [latestAnswer, setLatestAnswer] = useState('');
   const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | undefined>();
 
   const debounced = useMemo(() => {
     return debounce(async () => {
@@ -138,6 +139,7 @@ export const useGetBridgeMessage = ({
         setBridgeFeeFormatted(formatEther(fees));
         setBridgeFee(fees.toString());
       } catch (e) {
+        setError(e.message);
         console.error(e);
       } finally {
         setLoading(false);
@@ -167,5 +169,6 @@ export const useGetBridgeMessage = ({
     bridgeFeeFormatted,
     loading,
     latestAnswer,
+    error,
   };
 };
diff --git a/src/locales/en/messages.js b/src/locales/en/messages.js
diff --git a/src/locales/en/messages.po b/src/locales/en/messages.po
@@ -2232,6 +2232,10 @@ msgstr "Some migrated assets will not be used as collateral due to enabled isola
 msgid "Something went wrong"
 msgstr "Something went wrong"
 
+#: src/components/transactions/Bridge/BridgeModalContent.tsx
+msgid "Something went wrong fetching bridge message, please try again later."
+msgstr "Something went wrong fetching bridge message, please try again later."
+
 #: pages/500.page.tsx
 msgid "Sorry, an unexpected error happened. In the meantime you may try reloading the page, or come back later."
 msgstr "Sorry, an unexpected error happened. In the meantime you may try reloading the page, or come back later."