feat: Currently extension supporty connect to OneKey via Trezor, but we dont have metric to log this when imported the accounts.

app/scripts/lib/offscreen-bridge/trezor-offscreen-bridge.ts

@@ -30,6 +30,8 @@ import {
 export class TrezorOffscreenBridge implements TrezorBridge {
   model: string | undefined;
 
+  minorVersion: number | undefined;
+
   init(
     settings: {
       manifest: Manifest;
@@ -40,7 +42,8 @@ export class TrezorOffscreenBridge implements TrezorBridge {
         msg.target === OffscreenCommunicationTarget.extension &&
         msg.event === OffscreenCommunicationEvents.trezorDeviceConnect
       ) {
-        this.model = msg.payload;
+        this.model = msg.payload.model;
+        this.minorVersion = msg.payload.minorVersion;
       }
     });
 

app/scripts/metamask-controller.js

@@ -3357,6 +3357,7 @@ export default class MetamaskController extends EventEmitter {
       connectHardware: this.connectHardware.bind(this),
       forgetDevice: this.forgetDevice.bind(this),
       checkHardwareStatus: this.checkHardwareStatus.bind(this),
+      getHardwareDeviceName: this.getHardwareDeviceName.bind(this),
       unlockHardwareWalletAccount: this.unlockHardwareWalletAccount.bind(this),
       attemptLedgerTransportCreation:
         this.attemptLedgerTransportCreation.bind(this),
@@ -4694,15 +4695,38 @@ export default class MetamaskController extends EventEmitter {
   /**
    * get hardware account label
    *
+   * @param name
+   * @param index
+   * @param hdPathDescription
    * @returns string label
    */
-
   getAccountLabel(name, index, hdPathDescription) {
     return `${name[0].toUpperCase()}${name.slice(1)} ${
       parseInt(index, 10) + 1
     } ${hdPathDescription || ''}`.trim();
   }
 
+  /**
+   * get hardware wallet Device name for metric logging in UI.
+   * Currently it only handle the special case for OneKeyDevice connect metamask via Trezor.
+   *
+   * @param deviceName - HardwareDeviceNames
+   * @param hdPath - string
+   * @returns {HardwareDeviceNames|*}
+   */
+  async getHardwareDeviceName(deviceName, hdPath) {
+    if (deviceName === HardwareDeviceNames.trezor) {
+      const keyring = await this.getKeyringForDevice(deviceName, hdPath);
+      const { minorVersion } = keyring.bridge;
+      // OneKeyDevice can connect metamask via Trezor usb, and they use minorVersion 99 to differentiate oneKeyDevice and Trezor.
+      if (minorVersion && minorVersion === 99) {
+        return HardwareDeviceNames.oneKeyViaTrezor;
+      }
+    }
+
+    return deviceName;
+  }
+
   /**
    * Imports an account from a Trezor or Ledger device.
    *

app/scripts/metamask-controller.test.js

@@ -858,6 +858,74 @@ describe('MetaMaskController', () => {
         );
       });
 
+      describe('getHardwareDeviceName', () => {
+        it('should return the correct device name for Ledger', async () => {
+          const deviceName = 'ledger';
+          const hdPath = "m/44'/60'/0'/0/0";
+          const result = await metamaskController.getHardwareDeviceName(
+            deviceName,
+            hdPath,
+          );
+          expect(result).toBe('ledger');
+        });
+
+        it('should return the correct device name for Lattice', async () => {
+          const deviceName = 'lattice';
+          const hdPath = "m/44'/60'/0'/0/0";
+          const result = await metamaskController.getHardwareDeviceName(
+            deviceName,
+            hdPath,
+          );
+          expect(result).toBe('lattice');
+        });
+
+        it('should return the correct device name for Trezor', async () => {
+          const deviceName = 'trezor';
+          const hdPath = "m/44'/60'/0'/0";
+          jest
+            .spyOn(metamaskController, 'getKeyringForDevice')
+            .mockResolvedValue({
+              bridge: {
+                minorVersion: 1,
+                model: 'T',
+              },
+            });
+          const result = await metamaskController.getHardwareDeviceName(
+            deviceName,
+            hdPath,
+          );
+          expect(result).toBe('trezor');
+        });
+
+        it('should return undefined for unknown device name', async () => {
+          const deviceName = 'unknown';
+          const hdPath = "m/44'/60'/0'/0/0";
+          const result = await metamaskController.getHardwareDeviceName(
+            deviceName,
+            hdPath,
+          );
+          expect(result).toBe(deviceName);
+        });
+
+        it('should handle special case for OneKeyDevice via Trezor', async () => {
+          const deviceName = 'trezor';
+          const hdPath = "m/44'/60'/0'/0/0";
+          jest
+            .spyOn(metamaskController, 'getKeyringForDevice')
+            .mockResolvedValue({
+              bridge: {
+                model: 'T',
+                minorVersion: 99
+              },
+            });
+          const result = await metamaskController.getHardwareDeviceName(
+            deviceName,
+            hdPath,
+          );
+          expect(result).toBe('OneKey via Trezor');
+        });
+      });
+
       describe('forgetDevice', () => {
         it('should throw if it receives an unknown device name', async () => {
           const result = metamaskController.forgetDevice(

offscreen/scripts/trezor.ts

@@ -40,7 +40,10 @@ export default function init() {
               chrome.runtime.sendMessage({
                 target: OffscreenCommunicationTarget.extension,
                 event: OffscreenCommunicationEvents.trezorDeviceConnect,
-                payload: event.payload.features.model,
+                payload: {
+                  model: event.payload.features.model,
+                  minorVersion: event.payload.features.minor_version,
+                },
               });
             }
           });

shared/constants/hardware-wallets.ts

@@ -18,6 +18,7 @@ export enum HardwareKeyringNames {
 export enum HardwareDeviceNames {
   ledger = 'ledger',
   trezor = 'trezor',
+  oneKeyViaTrezor = 'OneKey via Trezor',
   lattice = 'lattice',
   qr = 'QR Hardware',
 }

ui/pages/create-account/connect-hardware/index.js

@@ -28,8 +28,9 @@ import {
 } from '../../../components/component-library';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 import { TextColor } from '../../../helpers/constants/design-system';
-import SelectHardware from './select-hardware';
+import { getHardwareDeviceName } from '../../../store/actions';
 import AccountList from './account-list';
+import SelectHardware from './select-hardware';
 
 const U2F_ERROR = 'U2F';
 const LEDGER_ERRORS_CODES = {
@@ -277,7 +278,7 @@ class ConnectHardwareForm extends Component {
       });
   };
 
-  onUnlockAccounts = (device, path) => {
+  onUnlockAccounts = async (device, path) => {
     const { history, mostRecentOverviewPage, unlockHardwareWalletAccounts } =
       this.props;
     const { selectedAccounts } = this.state;
@@ -290,6 +291,10 @@ class ConnectHardwareForm extends Component {
       MEW_PATH === path
         ? this.context.t('hardwareWalletLegacyDescription')
         : '';
+
+    // process device type. specially handle trezor for oneKey device.
+    const metricDeviceName = await getHardwareDeviceName(device, path);
+
     return unlockHardwareWalletAccounts(
       selectedAccounts,
       device,
@@ -302,7 +307,7 @@ class ConnectHardwareForm extends Component {
           event: MetaMetricsEventName.AccountAdded,
           properties: {
             account_type: MetaMetricsEventAccountType.Hardware,
-            account_hardware_type: device,
+            account_hardware_type: metricDeviceName,
           },
         });
         history.push(mostRecentOverviewPage);
@@ -313,7 +318,7 @@ class ConnectHardwareForm extends Component {
           event: MetaMetricsEventName.AccountAddFailed,
           properties: {
             account_type: MetaMetricsEventAccountType.Hardware,
-            account_hardware_type: device,
+            account_hardware_type: metricDeviceName,
             error: e.message,
           },
         });
@@ -459,6 +464,7 @@ const mapStateToProps = (state) => ({
   rpcPrefs: getRpcPrefsForCurrentProvider(state),
   accounts: getMetaMaskAccounts(state),
   connectedAccounts: getMetaMaskAccountsConnected(state),
+  getHardwareDeviceName: getHardwareDeviceName(state),
   defaultHdPaths: state.appState.defaultHdPaths,
   mostRecentOverviewPage: getMostRecentOverviewPage(state),
   ledgerTransportType: state.metamask.ledgerTransportType,
@@ -472,6 +478,9 @@ const mapDispatchToProps = (dispatch) => {
     connectHardware: (deviceName, page, hdPath, t) => {
       return dispatch(actions.connectHardware(deviceName, page, hdPath, t));
     },
+    getHardwareDeviceName: (deviceName, hdPath) => {
+      return dispatch(actions.getHardwareDeviceName(deviceName, hdPath));
+    },
     checkHardwareStatus: (deviceName, hdPath) => {
       return dispatch(actions.checkHardwareStatus(deviceName, hdPath));
     },

ui/pages/create-account/connect-hardware/index.test.tsx

@@ -13,10 +13,12 @@ import ConnectHardwareForm from '.';
 
 const mockConnectHardware = jest.fn();
 const mockCheckHardwareStatus = jest.fn().mockResolvedValue(false);
+const mockGetHardwareDeviceName = jest.fn().mockResolvedValue('ledger');
 
 jest.mock('../../../store/actions', () => ({
   connectHardware: () => mockConnectHardware,
   checkHardwareStatus: () => mockCheckHardwareStatus,
+  getHardwareDeviceName: () => mockGetHardwareDeviceName,
 }));
 
 jest.mock('../../../selectors', () => ({

ui/store/actions.ts

@@ -503,6 +503,13 @@ export function checkHardwareStatus(
   };
 }
 
+export const getHardwareDeviceName = (deviceName, hdPath) => {
+  return submitRequestToBackground('getHardwareDeviceName', [
+    deviceName,
+    hdPath,
+  ]);
+};
+
 export function forgetDevice(
   deviceName: HardwareDeviceNames,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {