fix(suite): restore connect popup address ui, hover row actions in e2e

Author: OriginalEveres

packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DeviceContextModal.tsx

@@ -3,6 +3,7 @@ import { useIntl } from 'react-intl';
 import { selectSelectedAccount } from '@suite/account';
 import { messages } from '@suite/intl';
 import { type MODAL_CONTEXT_DEVICE } from '@suite/modal';
+import { selectConnectPopupCall } from '@suite-common/connect-popup';
 import { selectSelectedDevice } from '@suite-common/device';
 import TrezorConnect, { UI_REQUEST } from '@trezor/connect';
 
@@ -17,6 +18,8 @@ import { SignMessageModal } from './SignMessageModal';
 import { ConfirmXpubModal } from '../ConfirmXpubModal';
 import type { ReduxModalProps } from '../ReduxModalProps';
 import { TransactionReviewModal } from '../TransactionReviewModal/TransactionReviewModal';
+import { ConnectAddressConfirmation } from '../UserContextModal/ConnectAddressConfirmation';
+import { ConnectSelectAccount } from '../UserContextModal/ConnectSelectAccount/ConnectSelectAccount';
 
 /** Modals requested by Device from `trezor-connect` */
 export const DeviceContextModal = ({
@@ -26,6 +29,7 @@ export const DeviceContextModal = ({
     const device = useSelector(selectSelectedDevice);
     const intl = useIntl();
     const selectedAccount = useSelector(selectSelectedAccount);
+    const popupCallState = useSelector(state => selectConnectPopupCall(state)?.state);
 
     if (!device) return null;
     const abort = () => TrezorConnect.cancel({ reason: intl.formatMessage(messages.TR_CANCELLED) });
@@ -78,10 +82,20 @@ export const DeviceContextModal = ({
                 return <ConfirmActionModal device={device} />;
             }
         }
-        case 'ButtonRequest_Address':
-            return data?.type === 'address' ? (
-                <ConfirmActionModal device={device} title="TR_COMPARE_ADDRESS_ON_TREZOR" />
-            ) : null;
+        case 'ButtonRequest_Address': {
+            if (data?.type !== 'address') {
+                return null;
+            }
+
+            if (popupCallState === 'address-confirmation') {
+                return <ConnectAddressConfirmation />;
+            }
+            if (popupCallState === 'select-account') {
+                return <ConnectSelectAccount />;
+            }
+
+            return <ConfirmActionModal device={device} title="TR_COMPARE_ADDRESS_ON_TREZOR" />;
+        }
         case 'ButtonRequest_PublicKey':
             return <ConfirmXpubModal onCancel={abort} />;
         default:

suite/e2e/tests/passphrase/passphrase-reconnection.test.ts

@@ -76,6 +76,7 @@ test.describe('Passphrase reconnection', { tag: ['@T3W1', '@T3T1'] }, () => {
             await dashboardPage.walletAtIndex(1).click();
             await walletPage.receiveButton.click();
             await expect(walletPage.usedAddress(0)).toBeVisible();
+            await walletPage.usedAddress(0).hover();
             await walletPage.usedAddressVerifyButton(0).click();
             await expect(page.getByText('Confirm passphrase')).toBeVisible();
             await dashboardPage.passphraseInput.fill('abc');
@@ -94,6 +95,7 @@ test.describe('Passphrase reconnection', { tag: ['@T3W1', '@T3T1'] }, () => {
         });
 
         await test.step('Second displaying receive address after reconnect should NOT prompt for passphrase', async () => {
+            await walletPage.usedAddress(0).hover();
             await walletPage.usedAddressVerifyButton(0).click();
             // Going straight to the device prompt proves no passphrase was requested again.
             await devicePrompt.confirmOnDevicePromptIsShown();

suite/e2e/tests/passphrase/passphrase.test.ts

@@ -102,6 +102,7 @@ test.describe('Passphrase', { tag: ['@T3W1', '@T3T1'] }, () => {
                 await expect(walletPage.usedAddress(0)).toBeVisible();
                 await expect(walletPage.verifyAddressButton).toBeEnabled();
 
+                await walletPage.usedAddress(0).hover();
                 await walletPage.usedAddressVerifyButton(0).click();
                 await devicePrompt.confirmOnDevicePromptIsShown();
                 await expect(device).toShowReceiveAddress(abcAddr);