c9b60a9 · bridge · git.iko.soy

src/views/Login.js+8−8

compare with master

unifiedsplit

@@ -3,20 +3,20 @@ import React, { useState, useEffect } from 'react';

3import * as azimuth from 'azimuth-js';

4

5import { H1 } from 'indigo-react';

6−import View from '../components/View';

6+import View from 'components/View';

7−import Tabs from '../components/Tabs';

7+import Tabs from 'components/Tabs';

8

9import Ticket from './Login/Ticket';

10import Mnemonic from './Login/Mnemonic';

11import Advanced from './Login/Advanced';

12

13−import * as need from '../lib/need';

13+import * as need from 'lib/need';

14−import { ROUTE_NAMES } from '../lib/routeNames';

14+import { ROUTE_NAMES } from 'lib/routeNames';

15

16−import { useHistory } from '../store/history';

16+import { useHistory } from 'store/history';

17−import { useNetwork } from '../store/network';

17+import { useNetwork } from 'store/network';

18−import { useWallet } from '../store/wallet';

18+import { useWallet } from 'store/wallet';

19−import { usePointCursor } from '../store/pointCursor';

19+import { usePointCursor } from 'store/pointCursor';

20

21const TABS = {

22 TICKET: Symbol('TICKET'),

src/views/Login/Keystore.js+8−13

@@ -3,19 +3,14 @@ import { Ok, Error } from 'folktale/result';

3import React, { useState } from 'react';

4import * as keythereum from 'keythereum';

5

6−import View from '../../components/View';

6+import View from 'components/View';

7−import { PassphraseInput } from '../../components/Inputs';

7+import { PassphraseInput } from 'components/Inputs';

8−import { ForwardButton } from '../../components/Buttons';

8+import { ForwardButton } from 'components/Buttons';

9−import {

10− InputCaption,

11− UploadButton,

12− H3,

13− Warning,

14−} from '../../components/old/Base';

9+import { InputCaption, UploadButton, H3, Warning } from 'components/old/Base';

15−

10+

16−import * as need from '../../lib/need';

11+import * as need from 'lib/need';

17−import { EthereumWallet } from '../../lib/wallet';

12+import { EthereumWallet } from 'lib/wallet';

18−import { useWallet } from '../../store/wallet';

13+import { useWallet } from 'store/wallet';

19

14

20export default function Keystore({ loginCompleted }) {

15export default function Keystore({ loginCompleted }) {

21 // globals

16 // globals

src/views/Login/Ledger.js+5−5

@@ -5,8 +5,8 @@ import Transport from '@ledgerhq/hw-transport-u2f';

5import Eth from '@ledgerhq/hw-app-eth';

6import * as secp256k1 from 'secp256k1';

7

8−import View from '../../components/View';

8+import View from 'components/View';

9−import { ForwardButton } from '../../components/Buttons';

9+import { ForwardButton } from 'components/Buttons';

10import {

11 H1,

12 P,

@@ -14,10 +14,10 @@ import {

14 Input,

15 InnerLabel,

16 InnerLabelDropdown,

17−} from '../../components/old/Base';

17+} from 'components/old/Base';

18

19−import { LEDGER_LIVE_PATH, LEDGER_LEGACY_PATH } from '../../lib/ledger';

19+import { LEDGER_LIVE_PATH, LEDGER_LEGACY_PATH } from 'lib/ledger';

20−import { useWallet } from '../../store/wallet';

20+import { useWallet } from 'store/wallet';

21

22const chopHdPrefix = str => (str.slice(0, 2) === 'm/' ? str.slice(2) : str);

23

src/views/Login/Mnemonic.js+5−9

@@ -1,16 +1,12 @@

1import React, { useCallback, useEffect, useState } from 'react';

2import { Just, Nothing } from 'folktale/maybe';

3

4−import View from '../../components/View';

4+import View from 'components/View';

5−import {

6− MnemonicInput,

7− PassphraseInput,

8− HdPathInput,

9−} from '../../components/Inputs';

5+import { MnemonicInput, PassphraseInput, HdPathInput } from 'components/Inputs';

10−import { ForwardButton } from '../../components/Buttons';

6+import { ForwardButton } from 'components/Buttons';

11

7

12−import { walletFromMnemonic } from '../../lib/wallet';

8+import { walletFromMnemonic } from 'lib/wallet';

13−import { useWallet } from '../../store/wallet';

9+import { useWallet } from 'store/wallet';

14

10

15export default function Mnemonic({ advanced, loginCompleted }) {

11export default function Mnemonic({ advanced, loginCompleted }) {

16 const {

12 const {

src/views/Login/PrivateKey.js+5−5

@@ -1,12 +1,12 @@

1import { Just, Nothing } from 'folktale/maybe';

2import React, { useState } from 'react';

3

4−import View from '../../components/View';

4+import View from 'components/View';

5−import { PassphraseInput } from '../../components/Inputs';

5+import { PassphraseInput } from 'components/Inputs';

6−import { ForwardButton } from '../../components/Buttons';

6+import { ForwardButton } from 'components/Buttons';

7

8−import { EthereumWallet } from '../../lib/wallet';

8+import { EthereumWallet } from 'lib/wallet';

9−import { useWallet } from '../../store/wallet';

9+import { useWallet } from 'store/wallet';

10

11export default function PrivateKey({ loginCompleted }) {

12 const { wallet, setWallet } = useWallet();

src/views/Login/Shards.js+5−9

@@ -2,16 +2,12 @@ import { Just, Nothing } from 'folktale/maybe';

2import React, { useState } from 'react';

3import * as kg from 'urbit-key-generation/dist/index';

4

5−import View from '../../components/View';

5+import View from 'components/View';

6−import {

7− PointInput,

8− TicketInput,

9− PassphraseInput,

10−} from '../../components/Inputs';

6+import { PointInput, TicketInput, PassphraseInput } from 'components/Inputs';

11−import { ForwardButton } from '../../components/Buttons';

7+import { ForwardButton } from 'components/Buttons';

12

8

13−import { urbitWalletFromTicket } from '../../lib/wallet';

9+import { urbitWalletFromTicket } from 'lib/wallet';

14−import { useWallet } from '../../store/wallet';

10+import { useWallet } from 'store/wallet';

15

11

16export default function Shards({ loginCompleted }) {

12export default function Shards({ loginCompleted }) {

17 const { wallet, setUrbitWallet } = useWallet();

13 const { wallet, setUrbitWallet } = useWallet();

src/views/Login/Ticket.js+10−14

@@ -3,20 +3,16 @@ import React, { useState, useEffect } from 'react';

3import * as azimuth from 'azimuth-js';

4import * as ob from 'urbit-ob';

5

6−import View from '../../components/View';

6+import View from 'components/View';

7−import {

8− PointInput,

9− TicketInput,

10− PassphraseInput,

11−} from '../../components/Inputs';

7+import { PointInput, TicketInput, PassphraseInput } from 'components/Inputs';

12−import { ForwardButton } from '../../components/Buttons';

8+import { ForwardButton } from 'components/Buttons';

13−

9+

14−import * as need from '../../lib/need';

10+import * as need from 'lib/need';

15−import { WALLET_TYPES, urbitWalletFromTicket } from '../../lib/wallet';

11+import { WALLET_TYPES, urbitWalletFromTicket } from 'lib/wallet';

16−

12+

17−import { useNetwork } from '../../store/network';

13+import { useNetwork } from 'store/network';

18−import { useWallet } from '../../store/wallet';

14+import { useWallet } from 'store/wallet';

19−import { usePointCursor } from '../../store/pointCursor';

15+import { usePointCursor } from 'store/pointCursor';

20

16

21//TODO should be part of InputWithStatus component

17//TODO should be part of InputWithStatus component

22const INPUT_STATUS = {

18const INPUT_STATUS = {

src/views/Login/Trezor.js+5−5

@@ -4,18 +4,18 @@ import Maybe from 'folktale/maybe';

4import TrezorConnect from 'trezor-connect';

5import * as secp256k1 from 'secp256k1';

6

7−import View from '../../components/View';

7+import View from 'components/View';

8−import { ForwardButton } from '../../components/Buttons';

8+import { ForwardButton } from 'components/Buttons';

9import {

10 H1,

11 P,

12 InnerLabel,

13 Input,

14 InnerLabelDropdown,

15−} from '../../components/old/Base';

15+} from 'components/old/Base';

16

17−import { TREZOR_PATH } from '../../lib/trezor';

17+import { TREZOR_PATH } from 'lib/trezor';

18−import { useWallet } from '../../store/wallet';

18+import { useWallet } from 'store/wallet';

19

20export default function Trezor({ loginCompleted }) {

21 const { wallet, setWallet, setWalletHdPath } = useWallet();