Merge remote-tracking branch 'origin/dev' into pwa-header

safe-global · Jan 7, 2025 · 0d91a02 · 0d91a02
2 parents 7a37791 + 5bcc4c7
commit 0d91a02
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/apps/web/cypress/e2e/pages/main.page.js b/apps/web/cypress/e2e/pages/main.page.js
@@ -4,6 +4,8 @@ const acceptSelection = 'Save settings'
 const executeStr = 'Execute'
 const connectedOwnerBlock = '[data-testid="open-account-center"]'
 export const modalDialogCloseBtn = '[data-testid="modal-dialog-close-btn"]'
+const closeOutreachPopupBtn = 'button[aria-label="close outreach popup"]'
+
 export const noRelayAttemptsError = 'Not enough relay attempts remaining'
 
 export function checkElementBackgroundColor(element, color) {
@@ -204,6 +206,16 @@ export function acceptCookies2() {
   })
 }
 
+export function closeOutreachPopup() {
+  cy.wait(1000)
+  cy.get('body').then(($body) => {
+    if ($body.find(closeOutreachPopupBtn).length > 0) {
+      cy.get(closeOutreachPopupBtn).click()
+      cy.wait(500)
+    }
+  })
+}
+
 export function verifyOwnerConnected(prefix = 'sep:') {
   cy.get(connectedOwnerBlock).should('contain', prefix)
 }

diff --git a/apps/web/cypress/support/utils/wallet.js b/apps/web/cypress/support/utils/wallet.js
@@ -1,3 +1,5 @@
+import * as main from '../../e2e/pages/main.page'
+
 const onboardv2 = 'onboard-v2'
 const pkInput = '[data-testid="private-key-input"]'
 const pkConnectBtn = '[data-testid="pk-connect-btn"]'
@@ -42,7 +44,7 @@ export function connectSigner(signer) {
 
   function enterPrivateKey() {
     cy.wait(3000)
-    cy.get('body').then(($body) => {
+    return cy.get('body').then(($body) => {
       if ($body.find(pkInput).length > 0) {
         cy.get(pkInput)
           .find('input')
@@ -65,5 +67,7 @@ export function connectSigner(signer) {
     })
   }
 
-  enterPrivateKey()
+  enterPrivateKey().then(() => {
+    main.closeOutreachPopup()
+  })
 }
diff --git a/apps/web/src/components/common/TokenIcon/index.tsx b/apps/web/src/components/common/TokenIcon/index.tsx
@@ -19,7 +19,7 @@ const TokenIcon = ({
 }): ReactElement => {
   const src = useMemo(() => {
     return logoUri?.replace(COINGECKO_THUMB, COINGECKO_SMALL)
-  }, [])
+  }, [logoUri])
 
   return (
     <ImageFallback

diff --git a/apps/web/src/components/tx/SignOrExecuteForm/SignerForm/index.tsx b/apps/web/src/components/tx/SignOrExecuteForm/SignerForm/index.tsx
@@ -100,7 +100,7 @@ export const SignerForm = ({ willExecute }: { willExecute?: boolean }) => {
           >
             {options?.map((owner) => (
               <MenuItem key={owner} value={owner} disabled={!isOptionEnabled(owner)}>
-                <EthHashInfo address={owner} avatarSize={32} onlyName />
+                <EthHashInfo address={owner} avatarSize={32} onlyName copyAddress={false} />
                 {!isOptionEnabled(owner) && (
                   <Typography variant="caption" component="span" className={css.disabledPill}>
                     Already signed

diff --git a/apps/web/src/features/targetedOutreach/components/OutreachPopup/OutreachPopup.tsx b/apps/web/src/features/targetedOutreach/components/OutreachPopup/OutreachPopup.tsx
@@ -124,7 +124,7 @@ const OutreachPopup = (): ReactElement | null => {
                 </Typography>
               </Stack>
               <Track {...OUTREACH_EVENTS.CLOSE_POPUP}>
-                <IconButton className={css.close} aria-label="close" onClick={handleClose}>
+                <IconButton className={css.close} aria-label="close outreach popup" onClick={handleClose}>
                   <Close />
                 </IconButton>
               </Track>