436 feature complete type checks on token transactions

.github/workflows/build.yml

@@ -76,6 +76,8 @@ jobs:
           TEST_SEED_PHRASE_SENDER="${{ secrets.TEST_SEED_PHRASE_SENDER }}"
           TEST_SENDER_ADDR="${{ secrets.TEST_SENDER_ADDR }}"
           TEST_RECEIVER_ADDR="${{ secrets.TEST_RECEIVER_ADDR }}"
+          TEST_RECEIVER_EVM_ADDR="${{ secrets.TEST_RECEIVER_EVM_ADDR }}"
+          TEST_RECEIVER_METAMASK_EVM_ADDR="${{ secrets.TEST_RECEIVER_METAMASK_EVM_ADDR }}"
           EOF
 
       - name: Run tests
@@ -138,6 +140,7 @@ jobs:
           TEST_RECEIVER_ADDR="${{ secrets.TEST_RECEIVER_ADDR }}"
           TEST_SENDER_EVM_ADDR="${{ secrets.TEST_SENDER_EVM_ADDR }}"
           TEST_RECEIVER_EVM_ADDR="${{ secrets.TEST_RECEIVER_EVM_ADDR }}"
+          TEST_RECEIVER_METAMASK_EVM_ADDR="${{ secrets.TEST_RECEIVER_METAMASK_EVM_ADDR }}"
           EOF
       - name: Install pnpm
         uses: pnpm/action-setup@v4

e2e/sendTransaction.test.ts

@@ -73,6 +73,7 @@ test('send Flow COA to COA', async ({ page }) => {
     tokenname: /^FLOW \$/i,
     receiver: process.env.TEST_RECEIVER_EVM_ADDR!,
     successtext: 'success',
+    amount: '0.12345678', // 8 decimal places
   });
 });
 
@@ -95,6 +96,7 @@ test('send Flow COA to FLOW', async ({ page }) => {
     tokenname: /^FLOW \$/i,
     receiver: process.env.TEST_RECEIVER_ADDR!,
     successtext: 'success',
+    amount: '0.00123456', // 8 decimal places
   });
 });
 
@@ -105,6 +107,7 @@ test('send USDC token COA to FLOW', async ({ page }) => {
     tokenname: 'Bridged USDC (Celer) $',
     receiver: process.env.TEST_RECEIVER_ADDR!,
     successtext: 'success',
+    amount: '0.002468', // 6 decimal places
   });
 });
 
@@ -117,6 +120,7 @@ test('send Flow COA to EOA', async ({ page }) => {
     tokenname: /^FLOW \$/i,
     receiver: process.env.TEST_RECEIVER_METAMASK_EVM_ADDR!,
     successtext: 'success',
+    amount: '0.00123456', // 8 decimal places
   });
 });
 
@@ -127,9 +131,10 @@ test('send BETA token COA to EOA', async ({ page }) => {
     tokenname: 'BETA $',
     receiver: process.env.TEST_RECEIVER_METAMASK_EVM_ADDR!,
     successtext: 'success',
+    amount: '0.001234567890123456', // 8 decimal places
   });
 });
-//Move FTs from COA to FLOW
+/* //Move FTs from COA to FLOW
 test('move Flow COA to FLOW', async ({ page }) => {
   // Move FLOW token from COA to FLOW
   await moveTokenCOA({
@@ -164,7 +169,7 @@ test('move USDC token COA to FLOW homepage', async ({ page }) => {
     tokenname: 'Bridged USDC (Celer)',
     amount: '0.000123',
   });
-});
+}); */
 //Send NFT from COA to COA
 //Send NFT from COA to FLOW
 //Send NFT from COA to EOA

e2e/sendTransactionFromFlow.test.ts

@@ -74,6 +74,7 @@ test('send FLOW flow to flow', async ({ page }) => {
     page,
     tokenname: /^FLOW \$/i,
     receiver: process.env.TEST_RECEIVER_ADDR!,
+    amount: '0.00123456',
   });
 });
 
@@ -83,6 +84,7 @@ test('send stFlow flow to flow', async ({ page }) => {
     page,
     tokenname: 'Liquid Staked Flow $',
     receiver: process.env.TEST_RECEIVER_ADDR!,
+    amount: '0.00123456',
   });
 });
 
@@ -93,6 +95,7 @@ test('send FLOW flow to COA', async ({ page }) => {
     page,
     tokenname: /^FLOW \$/i,
     receiver: process.env.TEST_RECEIVER_EVM_ADDR!,
+    amount: '0.00123456',
   });
 });
 //Send USDC from Flow to Flow
@@ -102,6 +105,7 @@ test('send USDC flow to COA', async ({ page }) => {
     tokenname: 'USDC.e (Flow) $',
     receiver: process.env.TEST_RECEIVER_EVM_ADDR!,
     ingoreFlowCharge: true,
+    amount: '0.00123456',
   });
 });
 
@@ -112,6 +116,7 @@ test('send FLOW flow to EOA', async ({ page }) => {
     page,
     tokenname: /^FLOW \$/i,
     receiver: process.env.TEST_RECEIVER_METAMASK_EVM_ADDR!,
+    amount: '0.00123456',
   });
 });
 
@@ -122,9 +127,10 @@ test('send BETA flow to EOA', async ({ page }) => {
     tokenname: 'BETA $',
     receiver: process.env.TEST_RECEIVER_METAMASK_EVM_ADDR!,
     ingoreFlowCharge: true,
+    amount: '0.00123456',
   });
 });
-//Move FTs from  Flow to COA
+/* //Move FTs from  Flow to COA
 test('move Flow Flow to COA', async ({ page }) => {
   // Move FLOW token from FLOW to COA
   await moveTokenFlow({
@@ -160,3 +166,4 @@ test('move USDC token Flow to COA homepage', async ({ page }) => {
     ingoreFlowCharge: true,
   });
 });
+ */

e2e/utils/helper.ts

@@ -452,27 +452,27 @@ export const waitForTransaction = async ({
   const progressBar = page.getByRole('progressbar');
   await expect(progressBar).toBeVisible();
   // Get the pending item with the cadence txId that was put in the url and status is pending
-  const pendingItem = page
-    .getByTestId(new RegExp(`^.*${txId}.*${ingoreFlowCharge ? '(?<!FlowToken)' : ''}$`))
-    .filter({ hasText: 'Pending' });
+
+  const activityItemRegexp = new RegExp(`^.*${txId}.*${ingoreFlowCharge ? '(?<!FlowToken)' : ''}$`);
+  const pendingItem = page.getByTestId(activityItemRegexp).filter({ hasText: 'Pending' });
 
   await expect(pendingItem).toBeVisible({
     timeout: 60_000,
   });
   await expect(progressBar).not.toBeVisible({ timeout: 60_000 });
 
   // Get the executed item with the cadence txId that was put in the url and status is success
-  const executedItem = page
-    .getByTestId(new RegExp(`^.*${txId}.*${ingoreFlowCharge ? '(?<!FlowToken)' : ''}$`))
-    .filter({ hasText: successtext });
+  const executedItem = page.getByTestId(activityItemRegexp).filter({ hasText: successtext });
 
   await expect(executedItem).toBeVisible({
     timeout: 60_000,
   });
 
-  // if (amount) {
-  //   await expect(executedItem).toContainText(amount);
-  // }
+  if (amount) {
+    await expect(
+      page.getByTestId(activityItemRegexp).getByTestId(`token-value-${amount}`)
+    ).toBeVisible();
+  }
 };
 
 export const expect = test.expect;