feat: rename oneKeyViaTrezor occurences to oneKey

MetaMask · Jan 13, 2025 · 70c0d6f · 70c0d6f
1 parent 31e7a91
commit 70c0d6f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -4890,7 +4890,7 @@ export default class MetamaskController extends EventEmitter {
     let keyringName = null;
     switch (deviceName) {
       case HardwareDeviceNames.trezor:
-      case HardwareDeviceNames.oneKeyViaTrezor:
+      case HardwareDeviceNames.oneKey:
         keyringName = keyringOverrides?.trezor?.type || TrezorKeyring.type;
         break;
       case HardwareDeviceNames.ledger:
@@ -4999,7 +4999,7 @@ export default class MetamaskController extends EventEmitter {
       const { minorVersion } = keyring.bridge;
       // Specific case for OneKey devices, see `ONE_KEY_VIA_TREZOR_MINOR_VERSION` for further details.
       if (minorVersion && minorVersion === ONE_KEY_VIA_TREZOR_MINOR_VERSION) {
-        return HardwareDeviceNames.oneKeyViaTrezor;
+        return HardwareDeviceNames.oneKey;
       }
     }
 

diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
@@ -952,7 +952,7 @@ describe('MetaMaskController', () => {
             deviceName,
             hdPath,
           );
-          expect(result).toBe('OneKey via Trezor');
+          expect(result).toBe('OneKey');
         });
       });
 

diff --git a/shared/constants/hardware-wallets.ts b/shared/constants/hardware-wallets.ts
@@ -18,7 +18,7 @@ export enum HardwareKeyringNames {
 export enum HardwareDeviceNames {
   ledger = 'ledger',
   trezor = 'trezor',
-  oneKeyViaTrezor = 'OneKey via Trezor',
+  oneKey = 'OneKey',
   lattice = 'lattice',
   qr = 'QR Hardware',
 }

diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
@@ -128,7 +128,7 @@ class ConnectHardwareForm extends Component {
   async checkIfUnlocked() {
     for (const device of [
       HardwareDeviceNames.trezor,
-      HardwareDeviceNames.oneKeyViaTrezor,
+      HardwareDeviceNames.oneKey,
       HardwareDeviceNames.ledger,
       HardwareDeviceNames.lattice,
     ]) {

diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -70,7 +70,7 @@ export default class SelectHardware extends Component {
     if (this.state.selectedDevice) {
       if (
         (this.state.selectedDevice === HardwareDeviceNames.trezor ||
-          this.state.selectedDevice === HardwareDeviceNames.oneKeyViaTrezor) &&
+          this.state.selectedDevice === HardwareDeviceNames.oneKey) &&
         isUSBSupported
       ) {
         this.setState({
@@ -119,11 +119,10 @@ export default class SelectHardware extends Component {
       <button
         data-testid="connect-onekey-btn"
         className={classnames('hw-connect__btn', {
-          selected:
-            this.state.selectedDevice === HardwareDeviceNames.oneKeyViaTrezor,
+          selected: this.state.selectedDevice === HardwareDeviceNames.oneKey,
         })}
         onClick={(_) =>
-          this.setState({ selectedDevice: HardwareDeviceNames.oneKeyViaTrezor })
+          this.setState({ selectedDevice: HardwareDeviceNames.oneKey })
         }
       >
         <LogoOnekey className="hw-connect__btn__img" ariaLabel="OneKey" />
@@ -332,7 +331,7 @@ export default class SelectHardware extends Component {
         return this.renderLedgerTutorialSteps();
       case HardwareDeviceNames.trezor:
         return this.renderTrezorTutorialSteps();
-      case HardwareDeviceNames.oneKeyViaTrezor:
+      case HardwareDeviceNames.oneKey:
         return this.renderOnekeyTutorialSteps();
       case HardwareDeviceNames.lattice:
         return this.renderLatticeTutorialSteps();
-Original file line number
+Diff line change
@@ Expand Up / @@ -952,7 +952,7 @@ describe('MetaMaskController', () => { @@
                 deviceName,
                 hdPath,
               );
-              expect(result).toBe('OneKey via Trezor');
+              expect(result).toBe('OneKey');
             });
           });
@@ Expand Down @@