Fix CI (#228)

* Wait for CircularProgress to be removed in cypress tests * Add retry mechanism in NetworkContext * Increase CircularProgress timeout in cypress tests
GemWallet · Aug 6, 2023 · a75b237 · a75b237
1 parent 7041acd
commit a75b237
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/packages/extension/cypress/e2e/networks.cy.ts b/packages/extension/cypress/e2e/networks.cy.ts
@@ -33,6 +33,8 @@ describe('Switch networks', () => {
       }
     });
 
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
+
     // Login
     cy.get('input[name="password"]').type(PASSWORD);
     cy.contains('button', 'Unlock').click();

diff --git a/packages/extension/cypress/e2e/send_token.cy.ts b/packages/extension/cypress/e2e/send_token.cy.ts
@@ -34,6 +34,8 @@ describe('Send Token', () => {
       }
     });
 
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
+
     // Login
     cy.get('input[name="password"]').type(PASSWORD);
     cy.contains('button', 'Unlock').click();

diff --git a/packages/extension/cypress/e2e/wallet_management.cy.ts b/packages/extension/cypress/e2e/wallet_management.cy.ts
@@ -19,6 +19,8 @@ describe('Setup the initial wallet (no previous wallet)', () => {
         cy.stub((win as any).chrome.runtime, 'sendMessage').resolves({});
       }
     });
+
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
   });
 
   it('Create a new wallet', () => {
@@ -241,6 +243,8 @@ describe('Add an additional wallet (with previous wallet)', () => {
       }
     });
 
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
+
     // Login
     cy.get('input[name="password"]').type(PASSWORD);
     cy.contains('button', 'Unlock').click();
@@ -400,6 +404,8 @@ describe('Edit wallet', () => {
       }
     });
 
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
+
     // Login
     cy.get('input[name="password"]').type(PASSWORD);
     cy.contains('button', 'Unlock').click();
@@ -537,6 +543,8 @@ describe('Switch wallet', () => {
       }
     });
 
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
+
     // Login
     cy.get('input[name="password"]').type(PASSWORD);
     cy.contains('button', 'Unlock').click();
@@ -590,6 +598,8 @@ describe('Reset password', () => {
         cy.stub((win as any).chrome.runtime, 'sendMessage').resolves({});
       }
     });
+
+    cy.get('.MuiCircularProgress-root', { timeout: 20000 }).should('not.exist');
   });
 
   it('Reset password', () => {

diff --git a/packages/extension/src/contexts/NetworkContext/NetworkContext.tsx b/packages/extension/src/contexts/NetworkContext/NetworkContext.tsx
@@ -41,6 +41,9 @@ const NetworkProvider: FC = ({ children }) => {
   const [network, setNetwork] = useState<Network | string>();
 
   useEffect(() => {
+    let retryCount = 0;
+    const maxRetries = 3;
+
     const connectToNetwork = async () => {
       const network = loadNetwork();
       const ws = new Client(network.server);
@@ -52,6 +55,12 @@ const NetworkProvider: FC = ({ children }) => {
         await ws?.disconnect();
         setClient(null);
         Sentry.captureException(err);
+
+        // If connect fails, retry up to maxRetries times
+        if (retryCount < maxRetries) {
+          retryCount += 1;
+          setTimeout(connectToNetwork, 1000);
+        }
       }
     };