git.iko.soy/bridge
on master help sign in
Pull dumb constants out of function bodies
commit1a7e04e858dd0b86d8d522af679cd6c23cee71be authorFang <git@fang.io> dateTue 25 Jun 2019, 17:13 (7 years ago) parent8b8b3ee
2 files changed+18−17
compare with master
unifiedsplit
src/views/Login.js+12−12 src/views/Login/Ledger.js+6−5
src/views/Login.js+12−12
@@ -24,6 +24,18 @@ const TABS = {
2424 ADVANCED: Symbol('ADVANCED'),
2525};
2626
27+const tabViews = {
28+ [TABS.TICKET]: Ticket,
29+ [TABS.MNEMONIC]: Mnemonic,
30+ [TABS.ADVANCED]: Advanced,
31+};
32+
33+const tabOptions = [
34+ { title: 'Ticket', value: TABS.TICKET },
35+ { title: 'Mnemonic', value: TABS.MNEMONIC },
36+ { title: 'Advanced', value: TABS.ADVANCED },
37+];
38+
2739export default function Login() {
2840 // globals
2941 const history = useHistory();
@@ -79,18 +91,6 @@ export default function Login() {
7991 }
8092 };
8193
82− const tabViews = {
83− [TABS.TICKET]: Ticket,
84− [TABS.MNEMONIC]: Mnemonic,
85− [TABS.ADVANCED]: Advanced,
86− };
87−
88− const tabOptions = [
89− { title: 'Ticket', value: TABS.TICKET },
90− { title: 'Mnemonic', value: TABS.MNEMONIC },
91− { title: 'Advanced', value: TABS.ADVANCED },
92− ];
93−
9494 return (
9595 <View>
9696 <H1>Login</H1>
src/views/Login/Ledger.js+6−5
@@ -14,6 +14,12 @@ import { InnerLabel, InnerLabelDropdown } from 'components/old/Base';
1414import { LEDGER_LIVE_PATH, LEDGER_LEGACY_PATH } from 'lib/ledger';
1515import { useWallet } from 'store/wallet';
1616
17+const pathOptions = [
18+ { title: 'Ledger Live', value: LEDGER_LIVE_PATH },
19+ { title: 'Ledger Legacy', value: LEDGER_LEGACY_PATH },
20+ { title: 'Custom path', value: 'custom' },
21+];
22+
1723const chopHdPrefix = str => (str.slice(0, 2) === 'm/' ? str.slice(2) : str);
1824
1925const addHdPrefix = str => (str.slice(0, 2) === 'm/' ? str : 'm/' + str);
@@ -61,11 +67,6 @@ export default function Ledger({ loginCompleted }) {
6167 );
6268 };
6369
64− const pathOptions = [
65− { title: 'Ledger Live', value: LEDGER_LIVE_PATH },
66− { title: 'Ledger Legacy', value: LEDGER_LEGACY_PATH },
67− { title: 'Custom path', value: 'custom' },
68− ];
6970 const basePathTitle = pathOptions.find(o => o.value === basePath).title;
7071
7172 const accountOptions = times(20, i => ({