merge main

ChainSafe · Dec 12, 2024 · 4bc568c · 4bc568c
2 parents f32f301 + 505c787
commit 4bc568c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/packages/ui/cypress/tests/address-bar.cy.ts b/packages/ui/cypress/tests/address-bar.cy.ts
@@ -281,7 +281,7 @@ describe('Account address in the address bar', () => {
     cy.url({ timeout: 3000 }).should('include', address)
 
     // react-router takes some time to get the search params inside the links
-    cy.wait(500)
+    cy.wait(1000)
 
     topMenuItems.homeButton().click()
     cy.url().should('include', address)

diff --git a/packages/ui/cypress/tests/watched-accounts.cy.ts b/packages/ui/cypress/tests/watched-accounts.cy.ts
@@ -305,13 +305,13 @@ describe('Watched Accounts', () => {
   it('can see all multisigs that a watched signatory is a member of', () => {
     const { publicKey: signatoryPublicKey } = testAccounts['Multisig Member Account 1']
     const expectedAddresses = [
-      {
-        address: knownMultisigs['multisig-with-pure'].pureAddress,
-        expectedBadge: 'pure'
-      },
       {
         address: knownMultisigs['test-simple-multisig-1'].address,
         expectedBadge: 'multi'
+      },
+      {
+        address: knownMultisigs['multisig-with-pure'].pureAddress,
+        expectedBadge: 'pure'
       }
     ]
 

diff --git a/packages/ui/src/contexts/MultiProxyContext.tsx b/packages/ui/src/contexts/MultiProxyContext.tsx
@@ -317,7 +317,6 @@ const MultiProxyContextProvider = ({ children }: MultisigContextProps) => {
     (newMulti: typeof selectedMultiProxy | string) => {
       let multi: string | undefined
 
-      console.log('last: selectMultiProxy', newMulti)
       if (typeof newMulti === 'string') {
         multi = newMulti
       } else {
@@ -350,12 +349,6 @@ const MultiProxyContextProvider = ({ children }: MultisigContextProps) => {
       LOCALSTORAGE_LAST_MULTIPROXY_KEY_NETWORK &&
       localStorage.getItem(LOCALSTORAGE_LAST_MULTIPROXY_KEY_NETWORK)
 
-    console.log('lastUsedMultiProxy', lastUsedMultiProxy)
-    console.log('multisigList', multiProxyList)
-    console.log(
-      'last getMultiProxyByAddress(lastUsedMultiProxy)',
-      lastUsedMultiProxy && getMultiProxyByAddress(lastUsedMultiProxy)
-    )
     if (lastUsedMultiProxy && getMultiProxyByAddress(lastUsedMultiProxy)) {
       return lastUsedMultiProxy
     }