git.iko.soy/bridge
on master help sign in
Stop using relative import paths
commitc9b60a91ec5f57d9a2bad770fca867c433c7f047 authorFang <git@fang.io> dateTue 25 Jun 2019, 16:25 (7 years ago) parentfaa39fb
8 files changed+51−68
compare with master
unifiedsplit
src/views/Login.js+8−8 src/views/Login/Keystore.js+8−13 src/views/Login/Ledger.js+5−5 src/views/Login/Mnemonic.js+5−9 src/views/Login/PrivateKey.js+5−5 src/views/Login/Shards.js+5−9 src/views/Login/Ticket.js+10−14 src/views/Login/Trezor.js+5−5
src/views/Login.js+8−8
@@ -3,20 +3,20 @@ import React, { useState, useEffect } from 'react';
33import * as azimuth from 'azimuth-js';
44
55import { H1 } from 'indigo-react';
6−import View from '../components/View';
7−import Tabs from '../components/Tabs';
6+import View from 'components/View';
7+import Tabs from 'components/Tabs';
88
99import Ticket from './Login/Ticket';
1010import Mnemonic from './Login/Mnemonic';
1111import Advanced from './Login/Advanced';
1212
13−import * as need from '../lib/need';
14−import { ROUTE_NAMES } from '../lib/routeNames';
13+import * as need from 'lib/need';
14+import { ROUTE_NAMES } from 'lib/routeNames';
1515
16−import { useHistory } from '../store/history';
17−import { useNetwork } from '../store/network';
18−import { useWallet } from '../store/wallet';
19−import { usePointCursor } from '../store/pointCursor';
16+import { useHistory } from 'store/history';
17+import { useNetwork } from 'store/network';
18+import { useWallet } from 'store/wallet';
19+import { usePointCursor } from 'store/pointCursor';
2020
2121const TABS = {
2222 TICKET: Symbol('TICKET'),
src/views/Login/Keystore.js+8−13
@@ -3,19 +3,14 @@ import { Ok, Error } from 'folktale/result';
33import React, { useState } from 'react';
44import * as keythereum from 'keythereum';
55
6−import View from '../../components/View';
7−import { PassphraseInput } from '../../components/Inputs';
8−import { ForwardButton } from '../../components/Buttons';
9−import {
10− InputCaption,
11− UploadButton,
12− H3,
13− Warning,
14−} from '../../components/old/Base';
15−
16−import * as need from '../../lib/need';
17−import { EthereumWallet } from '../../lib/wallet';
18−import { useWallet } from '../../store/wallet';
6+import View from 'components/View';
7+import { PassphraseInput } from 'components/Inputs';
8+import { ForwardButton } from 'components/Buttons';
9+import { InputCaption, UploadButton, H3, Warning } from 'components/old/Base';
10+
11+import * as need from 'lib/need';
12+import { EthereumWallet } from 'lib/wallet';
13+import { useWallet } from 'store/wallet';
1914
2015export default function Keystore({ loginCompleted }) {
2116 // globals
src/views/Login/Ledger.js+5−5
@@ -5,8 +5,8 @@ import Transport from '@ledgerhq/hw-transport-u2f';
55import Eth from '@ledgerhq/hw-app-eth';
66import * as secp256k1 from 'secp256k1';
77
8−import View from '../../components/View';
9−import { ForwardButton } from '../../components/Buttons';
8+import View from 'components/View';
9+import { ForwardButton } from 'components/Buttons';
1010import {
1111 H1,
1212 P,
@@ -14,10 +14,10 @@ import {
1414 Input,
1515 InnerLabel,
1616 InnerLabelDropdown,
17−} from '../../components/old/Base';
17+} from 'components/old/Base';
1818
19−import { LEDGER_LIVE_PATH, LEDGER_LEGACY_PATH } from '../../lib/ledger';
20−import { useWallet } from '../../store/wallet';
19+import { LEDGER_LIVE_PATH, LEDGER_LEGACY_PATH } from 'lib/ledger';
20+import { useWallet } from 'store/wallet';
2121
2222const chopHdPrefix = str => (str.slice(0, 2) === 'm/' ? str.slice(2) : str);
2323
src/views/Login/Mnemonic.js+5−9
@@ -1,16 +1,12 @@
11import React, { useCallback, useEffect, useState } from 'react';
22import { Just, Nothing } from 'folktale/maybe';
33
4−import View from '../../components/View';
5−import {
6− MnemonicInput,
7− PassphraseInput,
8− HdPathInput,
9−} from '../../components/Inputs';
10−import { ForwardButton } from '../../components/Buttons';
4+import View from 'components/View';
5+import { MnemonicInput, PassphraseInput, HdPathInput } from 'components/Inputs';
6+import { ForwardButton } from 'components/Buttons';
117
12−import { walletFromMnemonic } from '../../lib/wallet';
13−import { useWallet } from '../../store/wallet';
8+import { walletFromMnemonic } from 'lib/wallet';
9+import { useWallet } from 'store/wallet';
1410
1511export default function Mnemonic({ advanced, loginCompleted }) {
1612 const {
src/views/Login/PrivateKey.js+5−5
@@ -1,12 +1,12 @@
11import { Just, Nothing } from 'folktale/maybe';
22import React, { useState } from 'react';
33
4−import View from '../../components/View';
5−import { PassphraseInput } from '../../components/Inputs';
6−import { ForwardButton } from '../../components/Buttons';
4+import View from 'components/View';
5+import { PassphraseInput } from 'components/Inputs';
6+import { ForwardButton } from 'components/Buttons';
77
8−import { EthereumWallet } from '../../lib/wallet';
9−import { useWallet } from '../../store/wallet';
8+import { EthereumWallet } from 'lib/wallet';
9+import { useWallet } from 'store/wallet';
1010
1111export default function PrivateKey({ loginCompleted }) {
1212 const { wallet, setWallet } = useWallet();
src/views/Login/Shards.js+5−9
@@ -2,16 +2,12 @@ import { Just, Nothing } from 'folktale/maybe';
22import React, { useState } from 'react';
33import * as kg from 'urbit-key-generation/dist/index';
44
5−import View from '../../components/View';
6−import {
7− PointInput,
8− TicketInput,
9− PassphraseInput,
10−} from '../../components/Inputs';
11−import { ForwardButton } from '../../components/Buttons';
5+import View from 'components/View';
6+import { PointInput, TicketInput, PassphraseInput } from 'components/Inputs';
7+import { ForwardButton } from 'components/Buttons';
128
13−import { urbitWalletFromTicket } from '../../lib/wallet';
14−import { useWallet } from '../../store/wallet';
9+import { urbitWalletFromTicket } from 'lib/wallet';
10+import { useWallet } from 'store/wallet';
1511
1612export default function Shards({ loginCompleted }) {
1713 const { wallet, setUrbitWallet } = useWallet();
src/views/Login/Ticket.js+10−14
@@ -3,20 +3,16 @@ import React, { useState, useEffect } from 'react';
33import * as azimuth from 'azimuth-js';
44import * as ob from 'urbit-ob';
55
6−import View from '../../components/View';
7−import {
8− PointInput,
9− TicketInput,
10− PassphraseInput,
11−} from '../../components/Inputs';
12−import { ForwardButton } from '../../components/Buttons';
13−
14−import * as need from '../../lib/need';
15−import { WALLET_TYPES, urbitWalletFromTicket } from '../../lib/wallet';
16−
17−import { useNetwork } from '../../store/network';
18−import { useWallet } from '../../store/wallet';
19−import { usePointCursor } from '../../store/pointCursor';
6+import View from 'components/View';
7+import { PointInput, TicketInput, PassphraseInput } from 'components/Inputs';
8+import { ForwardButton } from 'components/Buttons';
9+
10+import * as need from 'lib/need';
11+import { WALLET_TYPES, urbitWalletFromTicket } from 'lib/wallet';
12+
13+import { useNetwork } from 'store/network';
14+import { useWallet } from 'store/wallet';
15+import { usePointCursor } from 'store/pointCursor';
2016
2117//TODO should be part of InputWithStatus component
2218const INPUT_STATUS = {
src/views/Login/Trezor.js+5−5
@@ -4,18 +4,18 @@ import Maybe from 'folktale/maybe';
44import TrezorConnect from 'trezor-connect';
55import * as secp256k1 from 'secp256k1';
66
7−import View from '../../components/View';
8−import { ForwardButton } from '../../components/Buttons';
7+import View from 'components/View';
8+import { ForwardButton } from 'components/Buttons';
99import {
1010 H1,
1111 P,
1212 InnerLabel,
1313 Input,
1414 InnerLabelDropdown,
15−} from '../../components/old/Base';
15+} from 'components/old/Base';
1616
17−import { TREZOR_PATH } from '../../lib/trezor';
18−import { useWallet } from '../../store/wallet';
17+import { TREZOR_PATH } from 'lib/trezor';
18+import { useWallet } from 'store/wallet';
1919
2020export default function Trezor({ loginCompleted }) {
2121 const { wallet, setWallet, setWalletHdPath } = useWallet();