Added QR code

app/scripts/controllers/mmi-controller.ts

@@ -35,6 +35,7 @@ import {
   IInteractiveRefreshTokenChangeEvent,
   Label,
   Signature,
+  ConnectionRequest,
 } from '../../../shared/constants/mmi-controller';
 import AccountTracker from '../lib/account-tracker';
 import AppStateController from './app-state';
@@ -106,6 +107,10 @@ export default class MMIController extends EventEmitter {
 
   private updateTransactionHash: (txId: string, txHash: string) => void;
 
+  private setChannelId: (channelId: string) => void;
+
+  private setConnectionRequest: (payload: ConnectionRequest | null) => void;
+
   public trackTransactionEvents: (
     args: { transactionMeta: TransactionMeta },
     // TODO: Replace `any` with type
@@ -147,6 +152,8 @@ export default class MMIController extends EventEmitter {
     this.extension = opts.extension;
 
     this.updateTransactionHash = opts.updateTransactionHash;
+    this.setChannelId = opts.setChannelId;
+    this.setConnectionRequest = opts.setConnectionRequest;
 
     this.trackTransactionEvents = opts.trackTransactionEvents;
     this.txStateManager = {
@@ -185,6 +192,20 @@ export default class MMIController extends EventEmitter {
         await this.handleSigningEvents(signature, messageId, 'v4');
       },
     );
+
+    this.transactionUpdateController.on(
+      'handshake',
+      async ({ channelId }: { channelId: string }) => {
+        this.setChannelId(channelId);
+      },
+    );
+
+    this.transactionUpdateController.on(
+      'connection.request',
+      async (payload: ConnectionRequest) => {
+        this.setConnectionRequest(payload);
+      },
+    );
   } // End of constructor
 
   async persistKeyringsAfterRefreshTokenChange() {

app/scripts/metamask-controller.js

@@ -1812,6 +1812,10 @@ export default class MetamaskController extends EventEmitter {
         this.txController.updateTransaction(txMeta, note),
       updateTransactionHash: (id, hash) =>
         this.txController.updateCustodialTransaction(id, { hash }),
+      setChannelId: (channelId) =>
+        this.institutionalFeaturesController.setChannelId(channelId),
+      setConnectionRequest: (payload) =>
+        this.institutionalFeaturesController.setConnectionRequest(payload),
     });
     ///: END:ONLY_INCLUDE_IF
 
@@ -3356,6 +3360,10 @@ export default class MetamaskController extends EventEmitter {
         this.institutionalFeaturesController.removeAddTokenConnectRequest.bind(
           this.institutionalFeaturesController,
         ),
+      setConnectionRequest:
+        this.institutionalFeaturesController.setConnectionRequest.bind(
+          this.institutionalFeaturesController,
+        ),
       showInteractiveReplacementTokenBanner:
         appStateController.showInteractiveReplacementTokenBanner.bind(
           appStateController,

package.json

@@ -261,14 +261,14 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.24",
-    "@metamask-institutional/custody-keyring": "^1.0.12",
-    "@metamask-institutional/extension": "^0.3.20",
-    "@metamask-institutional/institutional-features": "^1.2.15",
+    "@metamask-institutional/custody-controller": "^0.2.25",
+    "@metamask-institutional/custody-keyring": "^1.1.0",
+    "@metamask-institutional/extension": "^0.3.21",
+    "@metamask-institutional/institutional-features": "^1.3.0",
     "@metamask-institutional/portfolio-dashboard": "^1.4.0",
-    "@metamask-institutional/rpc-allowlist": "1.0.3",
-    "@metamask-institutional/sdk": "^0.1.25",
-    "@metamask-institutional/transaction-update": "^0.1.38",
+    "@metamask-institutional/rpc-allowlist": "^1.0.3",
+    "@metamask-institutional/sdk": "^0.1.26",
+    "@metamask-institutional/transaction-update": "^0.2.0",
     "@metamask/abi-utils": "^2.0.2",
     "@metamask/accounts-controller": "^11.0.0",
     "@metamask/address-book-controller": "^3.1.7",

shared/constants/mmi-controller.ts

@@ -56,6 +56,8 @@ export type MMIControllerOptions = {
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   updateTransaction: (txMeta: any) => void;
+  setChannelId: (channelId: string) => void;
+  setConnectionRequest: (payload: ConnectionRequest | null) => void;
 };
 
 export type ISignedEvent = {
@@ -89,3 +91,9 @@ export type NetworkConfiguration = {
   chainId: string;
   setActiveNetwork: (chainId: string) => void;
 };
+
+export type ConnectionRequest = {
+  payload: string;
+  traceId: string;
+  channelId: string;
+};

test/e2e/mmi/custodian-hooks/hooks.ts

@@ -260,7 +260,7 @@ export class CustodianTestClient implements ICustodianTestClient {
         const diffTime = transactions.map((tx: { createdAt: string }) =>
           Math.abs(
             new Date(tx.createdAt).getTime() -
-              parseInt(signedTransactionTime, 10),
+            parseInt(signedTransactionTime, 10),
           ),
         );
         const min = Math.min(...diffTime);
@@ -346,4 +346,21 @@ export class CustodianTestClient implements ICustodianTestClient {
   async rejectPersonalSignatureId(txId: string): Promise<string | RegExp> {
     return txId;
   }
+
+  public async postConnectionRequest(data: any) {
+    return (await axios
+      .post("https://neptune-custody.dev.metamask-institutional.io/qrcode/connection-request", data, {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      })
+      .then(function (response) {
+        expect(response.status).toBe(200);
+        return response.data;
+      })
+      .catch(function (error) {
+        console.log(error.response.data);
+        throw error;
+      })) as string;
+  }
 }

test/e2e/mmi/pageObjects/mmi-accountMenu-page.ts

@@ -1,6 +1,7 @@
 import { type Locator, type Page, test, expect } from '@playwright/test';
 import { getCustodianInfoByName } from '../helpers/custodian-helper';
 import { MMISaturnUIPage } from './mmi-saturn-ui-page';
+import { CustodianTestClient } from '../custodian-hooks/hooks';
 
 export class MMIAccountMenuPage {
   readonly page: Page;
@@ -46,7 +47,7 @@ export class MMIAccountMenuPage {
       .filter({ hasText: 'Select an account' });
   }
 
-  async connectCustodian(name: string, visual?: boolean) {
+  async connectCustodian(name: string, visual?: boolean, qrCode?: boolean) {
     await this.page
       .getByRole('button', { name: /Add account or hardware wallet/iu })
       .click();
@@ -61,6 +62,7 @@ export class MMIAccountMenuPage {
     }
 
     const custodian = await getCustodianInfoByName(name);
+
     await this.page
       .getByRole('list')
       .locator('div')
@@ -69,24 +71,45 @@ export class MMIAccountMenuPage {
       .getByTestId('custody-connect-button')
       .click();
 
-    await expect(
-      this.page.getByText(/connect saturn custody accounts/iu),
-    ).toBeVisible();
-    if (visual) {
-      await test.expect
-        .soft(this.page)
-        .toHaveScreenshot('custodian_connection_info.png', { fullPage: true });
+    if (qrCode) {
+      const spanElement = await this.page.$('span.hidden');
+
+      if (spanElement) {
+        let data = await spanElement.getAttribute('data-value');
+
+        while (!data) {
+          await new Promise(resolve => setTimeout(resolve, 1000));
+          data = await spanElement.getAttribute('data-value');
+        }
+
+        const client = new CustodianTestClient();
+        await client.setup();
+        await client.postConnectionRequest(data);
+        await this.page.getByTestId('select-all-accounts-selected-false').click();
+        await this.page.getByRole('button', { name: /connect/iu }).click();
+        await this.page.getByRole('button', { name: /close/iu }).first().click();
+      }
+    } else {
+      await expect(
+        this.page.getByText(/connect saturn custody accounts/iu),
+      ).toBeVisible();
+      if (visual) {
+        await test.expect
+          .soft(this.page)
+          .toHaveScreenshot('custodian_connection_info.png', { fullPage: true });
+      }
+
+      const pagePromise = this.page.context().waitForEvent('page');
+      await this.page.getByRole('button', { name: /continue/iu }).click();
+      const saturnUI = await pagePromise;
+      await saturnUI.waitForLoadState();
+
+      const saturnUIPage = new MMISaturnUIPage(saturnUI);
+      await saturnUIPage.connectMMI();
+      await this.page.getByRole('button', { name: /cancel/iu }).click();
+      await this.page.getByRole('button', { name: /back/iu }).click();
     }
 
-    const pagePromise = this.page.context().waitForEvent('page');
-    await this.page.getByRole('button', { name: /continue/iu }).click();
-    const saturnUI = await pagePromise;
-    await saturnUI.waitForLoadState();
-
-    const saturnUIPage = new MMISaturnUIPage(saturnUI);
-    await saturnUIPage.connectMMI();
-    await this.page.getByRole('button', { name: /cancel/iu }).click();
-    await this.page.getByRole('button', { name: /back/iu }).click();
   }
 
   async selectCustodyAccount(account: string) {

test/e2e/mmi/pageObjects/mmi-network-page.ts

@@ -32,6 +32,7 @@ export class MMINetworkPage {
   }
 
   async selectNetwork(network: string) {
-    await this.page.getByText(network).first().click();
+    await this.page.waitForSelector(`text=${network}`, { state: 'visible' });
+    await this.page.click(`text=${network}`, { force: true });
   }
 }

test/e2e/mmi/specs/qrCode.spec.ts

@@ -0,0 +1,65 @@
+import { type Page, type BrowserContext } from '@playwright/test';
+import { test } from '../helpers/extension-loader';
+import { ChromeExtensionPage } from '../pageObjects/mmi-extension-page';
+import { MMIMainMenuPage } from '../pageObjects/mmi-mainMenu-page';
+import { MMINetworkPage } from '../pageObjects/mmi-network-page';
+import { MMISignUpPage } from '../pageObjects/mmi-signup-page';
+import { MMIMainPage } from '../pageObjects/mmi-main-page';
+import { MMIAccountMenuPage } from '../pageObjects/mmi-accountMenu-page';
+import { CustodianTestClient } from '../custodian-hooks/hooks';
+import { SEPOLIA_DISPLAY_NAME } from '../helpers/utils';
+
+test.describe('QR Code Connection Request', () => {
+  test('run the extension and add custodian accounts using the QR Code feature', async ({
+    page,
+    context,
+  }) => {
+    const client = new CustodianTestClient();
+    await client.setup();
+
+    // Getting extension id of MMI
+    const extensions = new ChromeExtensionPage(await context.newPage());
+    await extensions.goto();
+    await extensions.setDevMode();
+    const extensionId = await extensions.getExtensionId();
+    await extensions.close();
+
+    const signUp = new MMISignUpPage(
+      await context.newPage(),
+      extensionId as string,
+    );
+    await signUp.goto();
+    await signUp.start();
+    await signUp.authentication();
+    await signUp.info();
+    await signUp.close();
+
+    // Setup testnetwork in settings
+    const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
+    await mainMenuPage.goto();
+    await mainMenuPage.fillPassword();
+    await mainMenuPage.finishOnboarding();
+    await mainMenuPage.selectMenuOption('settings');
+    await mainMenuPage.selectSettings('Advance');
+    await mainMenuPage.switchTestNetwork();
+    await mainMenuPage.closeSettings();
+
+    // Check network
+    const networkPage = new MMINetworkPage(page);
+    await networkPage.open();
+    await networkPage.selectNetwork(
+      process.env.MMI_E2E_TEST_NETWORK || SEPOLIA_DISPLAY_NAME,
+    );
+
+    // Get account from and to name
+    const accountFrom = await client.getAccountFrom();
+
+    const accountsPopup = new MMIAccountMenuPage(page);
+    await accountsPopup.accountsMenu();
+    await accountsPopup.connectCustodian('Neptune Custody', false, true);
+    await accountsPopup.selectCustodyAccount(accountFrom);
+
+    const mainPage = new MMIMainPage(page);
+    await mainPage.bringToFront();
+  });
+});

ui/components/institutional/qr-code-modal/index.tsx

@@ -0,0 +1 @@
+export { default } from './qr-code-modal';

ui/components/institutional/qr-code-modal/qr-code-modal.stories.tsx

@@ -0,0 +1,50 @@
+import React from 'react';
+import { Meta, StoryFn } from '@storybook/react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import QRCodeModal from './qr-code-modal';
+
+const mockStore = configureMockStore();
+const testData = {
+  metamask: {
+    institutionalFeatures: {
+      channelId: 'channel123',
+      connectionRequest: {
+        payload: 'encryptedPayload',
+      },
+    },
+  },
+};
+
+const store = mockStore(testData);
+
+const meta: Meta<typeof QRCodeModal> = {
+  title: 'Components/QRCodeModal',
+  decorators: [
+    (storyFn: any) => <Provider store={store}>{storyFn()}</Provider>,
+  ],
+  component: QRCodeModal,
+  argTypes: {
+    onClose: { action: 'closed' },
+    custodianName: { control: 'text' },
+    custodianURL: { control: 'text' },
+  },
+};
+
+export default meta;
+
+const Template: StoryFn<typeof QRCodeModal> = (args) => (
+  <QRCodeModal {...args} />
+);
+
+export const Default = Template.bind({});
+Default.args = {
+  custodianName: 'Test Custodian',
+  custodianURL: 'http://testcustodian.com',
+};
+
+export const WithError = Template.bind({});
+WithError.args = {
+  ...Default.args,
+  error: 'Failed to load data',
+};