add test with modal

ChainSafe · Jan 30, 2025 · 3451eb6 · 3451eb6
1 parent a4341d2
commit 3451eb6
Show file tree

Hide file tree

Showing 5 changed files with 117 additions and 13 deletions.
diff --git a/packages/ui/cypress/support/page-objects/modals/hiddenAccountInfoModal.ts b/packages/ui/cypress/support/page-objects/modals/hiddenAccountInfoModal.ts
@@ -0,0 +1,5 @@
+export const hiddenAccountInfoModal = {
+  body: () => cy.get('[data-cy=modal-hidden-account-info]'),
+  gotItButton: () => cy.get('[data-cy=button-hidden-account-info-gotit]'),
+  checkBoxMessage: () => cy.get('[data-cy=checkbox-dont-show-again]')
+}
diff --git a/packages/ui/cypress/support/page-objects/multisigPage.ts b/packages/ui/cypress/support/page-objects/multisigPage.ts
@@ -8,6 +8,7 @@ export const multisigPage = {
   subscanMenuOption: () => cy.get('[data-cy=menu-option-subscan]'),
   reviewButton: () => cy.get('[data-cy=button-review-tx]'),
   setIdentityMenuOption: () => cy.get('[data-cy=menu-option-set-identity]'),
+  hideAccountMenuOption: () => cy.get('[data-cy=menu-option-hide-this-account]'),
   assetHubBalance: (id: string) => cy.get(`[data-cy=asset-balance-${id}]`),
   nativeBalance: () => cy.get('[data-cy=asset-balance-native]'),
 

diff --git a/packages/ui/cypress/tests/hidden-accounts.cy.ts b/packages/ui/cypress/tests/hidden-accounts.cy.ts
@@ -9,8 +9,13 @@ import { westendMemberAccount } from '../fixtures/westendAccounts'
 import { topMenuItems } from '../support/page-objects/topMenuItems'
 import { multisigPage } from '../support/page-objects/multisigPage'
 import { landingPage } from '../support/page-objects/landingPage'
+import { hiddenAccountInfoModal } from '../support/page-objects/modals/hiddenAccountInfoModal'
 
 const randomAddress = 'HeVswqunza8rP2hEWDCThfiB5v2Jxng91yX2oGAZnCKtsgS'
+const westendWatchedAccount = {
+  pubKey: '0xc94fccf2736cad38e169025ed308fdb6ae09185350b05e6193d0f5343ce7362f',
+  address: '5GcfBqhnXDMsUwHaebV9zHew1A6aVHbt4tH2XtdKi7mM48hC'
+}
 
 const addHiddenAccount = (address: string) => {
   settingsPage.hiddenAccountsInputsWrapper().within(() => {
@@ -165,4 +170,93 @@ describe('Hidden Accounts', () => {
     settingsPage.hiddenAccountsContainer().should('have.length', 0)
     settingsPage.addButton().should('be.disabled')
   })
+
+  it('can hide an account from the 3 dots menu', () => {
+    cy.setupAndVisit({
+      url: landingPageNetworkAddress({
+        network: 'westend',
+        address: westendMemberAccount.hidden.expectedPure.address
+      }),
+      extensionConnectionAllowed: true,
+      injectExtensionWithAccounts: [westendMemberAccount.hidden.account]
+    })
+
+    multisigPage.optionsMenuButton().click()
+    multisigPage.hideAccountMenuOption().should('exist').click()
+    hiddenAccountInfoModal.body().should('be.visible')
+    hiddenAccountInfoModal.checkBoxMessage().should('not.be.checked')
+    hiddenAccountInfoModal.gotItButton().should('be.visible').click()
+    cy.url().should('include', westendMemberAccount.hidden.expectedSingleMultisig.westEndAddress)
+    topMenuItems.multiproxySelectorDesktop().should('be.visible').click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 1)
+    goToHiddenAccountSettings()
+    settingsPage
+      .hiddenAccountsContainer()
+      .should('have.length', 1)
+      .within(() => {
+        accountDisplay
+          .addressLabel()
+          .should('contain.text', westendMemberAccount.hidden.expectedPure.address.slice(0, 6))
+      })
+
+    // remove the hidden account
+    settingsPage.hiddenAccountDeleteButton().should('be.visible').click()
+    settingsPage.hiddenAccountsContainer().should('not.exist')
+    topMenuItems.multiproxySelectorDesktop().should('be.visible').click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 2)
+    topMenuItems.homeButton().click()
+
+    // hide it again but say to not view the message again
+    multisigPage.optionsMenuButton().click()
+    multisigPage.hideAccountMenuOption().should('exist').click()
+    hiddenAccountInfoModal.body().should('be.visible')
+    hiddenAccountInfoModal.checkBoxMessage().should('not.be.checked').click()
+    hiddenAccountInfoModal.gotItButton().should('be.visible').click()
+
+    topMenuItems.multiproxySelectorDesktop().should('be.visible').click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 1)
+    goToHiddenAccountSettings()
+    settingsPage.hiddenAccountsContainer().should('have.length', 1)
+
+    // remove the hidden account
+    settingsPage.hiddenAccountDeleteButton().should('be.visible').click()
+
+    topMenuItems.homeButton().click()
+    topMenuItems.multiproxySelectorDesktop().should('be.visible').click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 2)
+
+    multisigPage.optionsMenuButton().click()
+    multisigPage.hideAccountMenuOption().should('exist').click()
+    hiddenAccountInfoModal.body().should('not.exist')
+    topMenuItems.multiproxySelectorDesktop().should('be.visible').click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 1)
+  })
+
+  it.only('removes a watched account if hidding a watched account', () => {
+    cy.setupAndVisit({
+      url: landingPageNetworkAddress({
+        network: 'westend',
+        address: westendWatchedAccount.address
+      }),
+      extensionConnectionAllowed: true,
+      injectExtensionWithAccounts: [westendMemberAccount.hidden.account],
+      watchedAccounts: [westendWatchedAccount.pubKey]
+    })
+
+    topMenuItems.multiproxySelectorDesktop().click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 3)
+
+    // hide the watched account
+    multisigPage.optionsMenuButton().click()
+    multisigPage.hideAccountMenuOption().should('exist').click()
+    hiddenAccountInfoModal.body().should('be.visible')
+    hiddenAccountInfoModal.gotItButton().click()
+
+    topMenuItems.multiproxySelectorDesktop().click()
+    topMenuItems.multiproxySelectorOptionDesktop().should('have.length', 2)
+    goToHiddenAccountSettings()
+    settingsPage.hiddenAccountsContainer().should('not.exist')
+    settingsPage.watchedAccountsAccordion().click()
+    settingsPage.watchedAccountsContainer().should('not.exist')
+  })
 })
diff --git a/packages/ui/src/components/modals/HiddenAccountInfo.tsx b/packages/ui/src/components/modals/HiddenAccountInfo.tsx
@@ -55,11 +55,12 @@ const HiddenAccountInfo = ({ onClose, className }: Props) => {
                     setDontShow(!dontShow)
                   }}
                   // @ts-expect-error
-                  inputProps={{ 'data-cy': 'checkbox-message' }}
+                  inputProps={{ 'data-cy': 'checkbox-dont-show-again' }}
                 />
               }
             />
             <Button
+              data-cy="button-hidden-account-info-gotit"
               className="closeButton"
               variant="primary"
               onClick={onClick}

diff --git a/packages/ui/src/hooks/useGetIdentity.tsx b/packages/ui/src/hooks/useGetIdentity.tsx
@@ -43,19 +43,22 @@ export const useGetIdentity = () => {
         }
       ).then((val) => {
         const id: IdentityInfo = { judgements: [], sub }
-        val?.[0].judgements.forEach(([, judgement]) => {
-          id.judgements.push(judgement.type)
-        })
-        Object.entries(val?.[0]?.info || {}).forEach(([key, value]) => {
-          if ((value as IdentityData)?.type !== 'None') {
-            // console.log('key', JSONprint(key));
-            // console.log('value', JSONprint(value));
-            const text = (value as IdentityData)?.value as FixedSizeBinary<2> | undefined
-            if (text) {
-              id[key] = text.asText()
+
+        if (val?.[0]) {
+          val?.[0].judgements.forEach(([, judgement]) => {
+            id.judgements.push(judgement.type)
+          })
+          Object.entries(val?.[0]?.info || {}).forEach(([key, value]) => {
+            if ((value as IdentityData)?.type !== 'None') {
+              // console.log('key', JSONprint(key));
+              // console.log('value', JSONprint(value));
+              const text = (value as IdentityData)?.value as FixedSizeBinary<2> | undefined
+              if (text) {
+                id[key] = text.asText()
+              }
             }
-          }
-        })
+          })
+        }
 
         return id
       })