feat: custom hd path for new account

near · May 5, 2022 · 0c18b63 · 0c18b63
1 parent b848560
commit 0c18b63
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/packages/frontend/src/components/accounts/ledger/SetupLedgerNewAccount.js b/packages/frontend/src/components/accounts/ledger/SetupLedgerNewAccount.js
@@ -2,15 +2,20 @@ import React, { useState } from 'react';
 import { Translate } from 'react-localize-redux';
 
 import { Mixpanel } from '../../../mixpanel/index';
+import { getLedgerHDPath } from '../../../utils/ledger';
 import FormButton from '../../common/FormButton';
 import Container from '../../common/styled/Container.css';
 import LedgerIcon from '../../svg/LedgerIcon';
 import InstructionsModal from './InstructionsModal';
+import LedgerHdPaths from './LedgerHdPaths';
 
 export default ({
     onClickConnectLedger
 }) => {
     const [showInstructions, setShowInstructions] = useState(false);
+    const [path, setPath] = useState(1);
+    const [confirmedPath, setConfirmedPath] = useState(null);
+    const customLedgerHdPath = getLedgerHDPath(confirmedPath);
     return (
         <Container className='small-centered border ledger-theme'>
             <h1><Translate id='setupLedger.header' /></h1>
@@ -28,7 +33,17 @@ export default ({
                     <Translate id='setupLedger.twoLink' />
                 </span>.
             </h2>
-            <FormButton onClick={onClickConnectLedger}>
+            <LedgerHdPaths
+                path={path}
+                onSetPath={(path) => setPath(path)}
+                onConfirmHdPath={() => {
+                    setConfirmedPath(path);
+                    Mixpanel.track('SR-Ledger Setup set custom HD path');
+                }}
+            />
+            <FormButton onClick={()=>{
+                onClickConnectLedger(customLedgerHdPath);
+            }}>
                 <Translate id='button.continue' />
             </FormButton>
             <FormButton

diff --git a/packages/frontend/src/routes/SetupLedgerNewAccountWrapper.js b/packages/frontend/src/routes/SetupLedgerNewAccountWrapper.js
@@ -10,9 +10,9 @@ export function SetupLedgerNewAccountWrapper() {
     const dispatch = useDispatch();
     return (
         <SetupLedgerNewAccount
-            onClickConnectLedger={async () => {
+            onClickConnectLedger={async (path) => {
                 try {
-                    const ledgerPublicKey = await dispatch(getLedgerPublicKey());
+                    const ledgerPublicKey = await dispatch(getLedgerPublicKey(path));
                     const implicitAccountId = Buffer.from(ledgerPublicKey.data).toString('hex');
                     const account = wallet.getAccountBasic(implicitAccountId);
                     try {