Merge branch 'main' into rubyto-eco-page

FuelLabs · Jan 23, 2024 · 8c7db10 · 8c7db10
2 parents a749f84 + 03229dd
commit 8c7db10
Show file tree

Hide file tree

Showing 7 changed files with 209 additions and 1,846 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -73,7 +73,6 @@
     "@vitejs/plugin-react": "^4.0.0",
     "@xstate/cli": "^0.4.2",
     "adm-zip": "^0.5.10",
-    "jdown": "^1.0.5",
     "npm-run-all": "^4.1.5",
     "prop-types": "^15.8.1",
     "storybook": "^7.2.2",

diff --git a/packages/app/playwright/e2e/Bridge.test.ts b/packages/app/playwright/e2e/Bridge.test.ts
@@ -135,6 +135,8 @@ test.describe('Bridge', () => {
         await page.locator(':nth-match(:text("Done"), 1)').waitFor();
 
         // Check toast success feedback of tx created
+        // Toast message has delay of 2 seconds
+        await page.waitForTimeout(2000);
         await hasText(page, INITIATE_DEPOSIT);
         await page.locator(':nth-match(:text("Done"), 3)').waitFor();
 
@@ -215,6 +217,8 @@ test.describe('Bridge', () => {
         await page.locator(':nth-match(:text("Done"), 1)').waitFor();
 
         // Check toast success feedback of tx created
+        // Toast message has delay of 2 seconds
+        await page.waitForTimeout(2000);
         await hasText(page, INITIATE_WITHDRAW);
 
         // check time left feedback
@@ -388,6 +392,8 @@ test.describe('Bridge', () => {
         await page.locator(':nth-match(:text("Done"), 1)').waitFor();
 
         // Check toast success feedback of tx created
+        // Toast message has delay of 2 seconds
+        await page.waitForTimeout(2000);
         await hasText(page, INITIATE_DEPOSIT);
         await page.locator(':nth-match(:text("Done"), 2)').waitFor();
       });
@@ -498,6 +504,8 @@ test.describe('Bridge', () => {
         await page.locator(':nth-match(:text("Done"), 1)').waitFor();
 
         // Check toast success feedback of tx created
+        // Toast message has delay of 2 seconds
+        await page.waitForTimeout(2000);
         await hasText(page, INITIATE_WITHDRAW);
 
         // check time left feedback

diff --git a/packages/app/src/systems/Bridge/components/BridgeTxOverview/BridgeTxOverview.tsx b/packages/app/src/systems/Bridge/components/BridgeTxOverview/BridgeTxOverview.tsx
@@ -32,7 +32,7 @@ export const BridgeTxOverview = ({
     <Box.Stack css={styles.stack}>
       <Box.Flex css={styles.txItem}>
         <Text css={styles.labelText}>ID</Text>
-        <Link href={explorerLink} isExternal css={styles.infoText}>
+        <Link href={explorerLink} isExternal css={styles.linkText}>
           <Box aria-label="Transaction ID">{transactionId.toString()}</Box>
         </Link>
       </Box.Flex>
@@ -100,6 +100,10 @@ const styles = {
     fontSize: '$sm',
     color: '$intentsBase12',
   }),
+  linkText: cssObj({
+    fontSize: '$sm',
+    color: '$intentsPrimary9',
+  }),
   directionInfo: cssObj({
     gap: '$1',
     alignItems: 'center',

diff --git a/packages/app/src/systems/Chains/eth/machines/txEthToFuelMachine.tsx b/packages/app/src/systems/Chains/eth/machines/txEthToFuelMachine.tsx
@@ -357,10 +357,12 @@ export const txEthToFuelMachine = createMachine(
       }),
       notifyEthTxSuccess: (ctx) => {
         if (ctx.ethTxId && EthTxCache.getTxIsCreated(ctx.ethTxId)) {
-          toast.success(
-            'Deposit successfully initiated. You may now close the popup.',
-            { duration: 5000 }
-          );
+          setTimeout(() => {
+            toast.success(
+              'Deposit successfully initiated. You may now close the popup.',
+              { duration: 5000 }
+            );
+          }, 2000);
           EthTxCache.removeTxCreated(ctx.ethTxId);
         }
       },

diff --git a/packages/app/src/systems/Chains/fuel/hooks/useTxFuelToEth.tsx b/packages/app/src/systems/Chains/fuel/hooks/useTxFuelToEth.tsx
@@ -108,7 +108,7 @@ const txFuelToEthSelectors = {
         isSelected: status.isConfirmTransactionSelected,
       },
       {
-        name: 'Receive on ETH',
+        name: 'Receive on Ethereum',
         status: status.isReceiveDone ? 'Done!' : 'Automatic',
         isLoading: status.isReceiveLoading,
         isDone: status.isReceiveDone,

diff --git a/packages/app/src/systems/Chains/fuel/machines/txFuelToEthMachine.tsx b/packages/app/src/systems/Chains/fuel/machines/txFuelToEthMachine.tsx
@@ -407,10 +407,12 @@ export const txFuelToEthMachine = createMachine(
       },
       notifyFuelTxSuccess: (ctx) => {
         if (ctx.fuelTxId && FuelTxCache.getTxIsCreated(ctx.fuelTxId)) {
-          toast.success(
-            'Withdraw successfully initiated. You may now close the popup.',
-            { duration: 5000 }
-          );
+          setTimeout(() => {
+            toast.success(
+              'Withdraw successfully initiated. You may now close the popup.',
+              { duration: 5000 }
+            );
+          }, 2000);
           FuelTxCache.removeTxCreated(ctx.fuelTxId);
         }
       },