e366ef3 · bridge · git.iko.soy

git.iko.soy/bridge

refactor: move all old components into /old subdir, update view references

commite366ef3dcb7885f4d86714f3038c81d958dbe442 authorMatt Condon (shrugs) <mattgcondon@gmail.com> dateTue 18 Jun 2019, 14:49 (7 years ago) parent8011c59

78 files changed+145−178

compare with master

unifiedsplit

src/components/Container.jsdeleted−23

@@ -1,23 +0,0 @@

1−import React from 'react';

2−import PropTypes from 'prop-types';

3−

4−const Container = ({ className, children, style }) => {

5− return (

6− <main className={`container ${className}`} style={style}>

7− {children}

8− </main>

9− );

10−};

11−

12−Container.propTypes = {

13− className: PropTypes.string,

14− children: PropTypes.node,

15− style: PropTypes.object,

16−};

17−

18−Container.defaultProps = {

19− className: '',

20− style: {},

21−};

22−

23−export default Container;

src/components/Footer.jsdeleted−15

@@ -1,15 +0,0 @@

1−import React from 'react';

2−

3−import { version } from '../../package.json';

4−

5−const Footer = props => (

6− <footer className={'row h-13 mt-20'}>

7− <div className={'col-md-6 text-mono'}>{'v' + version}</div>

8−

9− <div className={'col-md-3'}>

10− <a href="https://github.com/urbit/bridge">{'GitHub'}</a>

11− </div>

12− </footer>

13−);

14−

15−export default Footer;

src/components/Router.jsnew file+13

@@ -0,0 +1,13 @@

1+import React from 'react';

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

4+import router from 'lib/router';

6+// router is just a component that renders a specific view

7+// depending on the lastest route in the history

8+export default function Router() {

9+ const history = useHistory();

10+ const Route = router(history.peek());

11+

12+ return <Route />;

13+}

src/components/View.jsnew file+18

@@ -0,0 +1,18 @@

1+import React from 'react';

2+import cn from 'classnames';

4+// View is a top-level component that all Views must render to inherit styling

5+function View({ className, ...rest }) {

6+ return <div className={cn('mw-1', className)} {...rest} />;

7+}

9+View.Full = function FullView({ className, ...rest }) {

10+ return (

11+ <div

12+ className={cn('mw-2 ph-1 ph-3-ns ph-9-md ph-10-lg', className)}

13+ {...rest}

14+ />

15+ );

16+};

17+

18+export default View;

src/components/icons/Chevron.jsdeleted−29

@@ -1,29 +0,0 @@

1−import React from 'react';

2−import PropTypes from 'prop-types';

3−

4−const Chevron = props => {

5− return (

6− <img

7− src={`data:image/svg+xml;utf8,<svg width="11" height="24" viewBox="0 0 11 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M10 12L10.387 12.3166L10.646 12L10.387 11.6833L10 12ZM0.613022 1.31662L9.61302 12.3166L10.387 11.6833L1.38698 0.68338L0.613022 1.31662ZM9.61302 11.6833L0.613021 22.6834L1.38698 23.3166L10.387 12.3166L9.61302 11.6833Z" stroke="${props.color}" stroke-width="${props.strokeWidth}" fill="${props.color}"/></svg>`}

8− alt=""

9− style={props.style}

10− className={props.className}

11− />

12− );

13−};

14−

15−Chevron.propTypes = {

16− style: PropTypes.object,

17− className: PropTypes.string,

18− color: PropTypes.string,

19− strokeWidth: PropTypes.string,

20−};

21−

22−Chevron.defaultProps = {

23− style: {},

24− className: '',

25− color: 'black',

26− strokeWidth: '1px',

27−};

28−

29−export default Chevron;

src/components/Anchor.js → src/components/old/Anchor.jsrenamed

The content is the same.

src/components/Base.js → src/components/old/Base.jsrenamed+2−6

@@ -10,9 +10,9 @@ import {

1010 validateNetworkKey,

1111 validateNetworkSeed,

1212 validateShard,

13−} from '../lib/validators';

13+} from '../../lib/validators';

1414

15−import { prependSig } from '../lib/transformers';

15+import { prependSig } from '../../lib/transformers';

1616

1717// Buttons

1818import Button from './Button';

@@ -44,7 +44,6 @@ import Breadcrumb from './Breadcrumb';

4444import BreadcrumbItem from './BreadcrumbItem';

4545

4646// Layout

47−import Container from './Container';

4847import Col from './Col';

4948import Row from './Row';

5049// import FlexRow from './FlexRow';

@@ -63,7 +62,6 @@ import Warning from './Warning';

6362// Misc

6463import ValidatedSigil from './ValidatedSigil';

6564import ValidatedBlockie from './ValidatedBlockie';

66−import Chevron from './icons/Chevron';

6765import ShowBlockie from './ShowBlockie';

6866import Passport from './Passport';

6967

@@ -168,7 +166,6 @@ export {

168166 HorizontalSelector,

169167 Breadcrumb,

170168 BreadcrumbItem,

171− Container,

172169 Col,

173170 Row,

174171 // FlexRow,

@@ -181,6 +178,5 @@ export {

181178 P,

182179 Code,

183180 Warning,

184− Chevron,

185181 Passport,

186182};

src/components/Blockie.js → src/components/old/Blockie.jsrenamed

The content is the same.

src/components/Breadcrumb.js → src/components/old/Breadcrumb.jsrenamed

The content is the same.

src/components/BreadcrumbItem.js → src/components/old/BreadcrumbItem.jsrenamed

The content is the same.

src/components/Button.js → src/components/old/Button.jsrenamed

The content is the same.

src/components/Checkbox.js → src/components/old/Checkbox.jsrenamed

The content is the same.

src/components/CheckboxButton.js → src/components/old/CheckboxButton.jsrenamed

The content is the same.

src/components/Code.js → src/components/old/Code.jsrenamed

The content is the same.

src/components/Col.js → src/components/old/Col.jsrenamed

The content is the same.

src/components/DropdownDivider.js → src/components/old/DropdownDivider.jsrenamed

The content is the same.

src/components/DropdownItem.js → src/components/old/DropdownItem.jsrenamed

The content is the same.

src/components/FlexCol.js → src/components/old/FlexCol.jsrenamed

The content is the same.

src/components/FlexRow.js → src/components/old/FlexRow.jsrenamed

The content is the same.

src/components/Form.js → src/components/old/Form.jsrenamed

The content is the same.

src/components/H1.js → src/components/old/H1.jsrenamed

The content is the same.

src/components/H2.js → src/components/old/H2.jsrenamed

The content is the same.

src/components/H3.js → src/components/old/H3.jsrenamed

The content is the same.

src/components/H4.js → src/components/old/H4.jsrenamed

The content is the same.

src/components/Header.js → src/components/old/Header.jsrenamed+9−13

@@ -1,13 +1,13 @@

11import React from 'react';

2−import { Button, Chevron } from './Base';

2+import { Button } from './Base';

4−import { getRouteBreadcrumb } from '../lib/router';

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

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

7−import { isLast } from '../lib/lib';

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

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

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

4+import { getRouteBreadcrumb } from '../../lib/router';

5+import { ROUTE_NAMES } from '../../lib/routeNames';

6+import { useHistory } from '../../store/history';

7+import { isLast } from '../../lib/lib';

8+import { useNetwork } from '../../store/network';

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

10+import { usePointCursor } from '../../store/pointCursor';

1111

1212// hook to create a breadcrumb builder function based on the current

1313// global states

@@ -35,11 +35,7 @@ function Crumbs(props) {

3535 {breadcrumbBuilder(route)}

3636 </Button>

3737

38− {isLast(history.size, idx) ? (

39− <div />

40− ) : (

41− <Chevron className={'h-4 mh-2'} />

42− )}

38+ {isLast(history.size, idx) ? <div /> : '/'}

4339 </div>

4440 );

4541 })}

src/components/HorizontalSelector.js → src/components/old/HorizontalSelector.jsrenamed

The content is the same.

src/components/InnerLabel.js → src/components/old/InnerLabel.jsrenamed

The content is the same.

src/components/InnerLabelDropdown.js → src/components/old/InnerLabelDropdown.jsrenamed

The content is the same.

src/components/Input.js → src/components/old/Input.jsrenamed

The content is the same.

src/components/InputCaption.js → src/components/old/InputCaption.jsrenamed

The content is the same.

src/components/Label.js → src/components/old/Label.jsrenamed

The content is the same.

src/components/P.js → src/components/old/P.jsrenamed

The content is the same.

src/components/Passport.js → src/components/old/Passport.jsrenamed+4−4

@@ -6,10 +6,10 @@ import PropTypes from 'prop-types';

66import PaperCollateralRenderer from 'PaperCollateralRenderer';

77import { Button } from './Base';

9−import { WALLET_STATES } from '../lib/invite';

10−import { downloadWallet } from '../lib/invite';

11−import { compose } from '../lib/lib';

12−import { withWallet } from '../store/wallet';

9+import { WALLET_STATES } from '../../lib/invite';

10+import { downloadWallet } from '../../lib/invite';

11+import { compose } from '../../lib/lib';

12+import { withWallet } from '../../store/wallet';

1313

1414class Passport extends React.Component {

1515 constructor(props) {

src/components/PointList.js → src/components/old/PointList.jsrenamed+1−1

@@ -1,7 +1,7 @@

11import React from 'react';

22import { chunk } from 'lodash';

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

4+import { usePointCursor } from '../../store/pointCursor';

66import { Row } from './Base';

77import RenderedPoint from './RenderedPoint';

src/components/ProtoAnchor.js → src/components/old/ProtoAnchor.jsrenamed

The content is the same.

src/components/ProtoButton.js → src/components/old/ProtoButton.jsrenamed+1−1

@@ -1,6 +1,6 @@

11import React from 'react';

22import PropTypes from 'prop-types';

3−import { getDomProps } from '../lib/base';

3+import { getDomProps } from '../../lib/base';

55const ProtoButton = props => {

66 return (

src/components/ProtoInput.js → src/components/old/ProtoInput.jsrenamed+1−1

@@ -1,7 +1,7 @@

11import React from 'react';

22import PropTypes from 'prop-types';

4−import { getDomProps } from '../lib/base';

4+import { getDomProps } from '../../lib/base';

66const ProtoInput = props => {

77 return (

src/components/ProtoTextarea.js → src/components/old/ProtoTextarea.jsrenamed+1−1

@@ -1,7 +1,7 @@

11import React from 'react';

22import PropTypes from 'prop-types';

4−import { getDomProps } from '../lib/base';

4+import { getDomProps } from '../../lib/base';

66const ProtoTextarea = props => {

77 return (

src/components/ReactSVGComponents.js → src/components/old/ReactSVGComponents.jsrenamed

The content is the same.

src/components/RenderedPoint.js → src/components/old/RenderedPoint.jsrenamed+1−1

@@ -5,7 +5,7 @@ import { Button } from './Base';

55import { pour } from 'sigil-js';

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

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

8+import { ROUTE_NAMES } from '../../lib/routeNames';

99import ReactSVGComponents from './ReactSVGComponents';

1010

1111const RenderedPoint = props => {

src/components/Row.js → src/components/old/Row.jsrenamed

The content is the same.

src/components/RowCol.js → src/components/old/RowCol.jsrenamed

The content is the same.

src/components/ShowBlockie.js → src/components/old/ShowBlockie.jsrenamed+1−1

@@ -2,7 +2,7 @@ import React from 'react';

22import PropTypes from 'prop-types';

33import makeBlockie from 'ethereum-blockies-base64';

44import Button from './Button';

5−import { invert } from '../lib/state';

5+import { invert } from '../../lib/state';

77const isValidAddress = address => /^0x[0-9a-fA-F]{40}$/.test(address);

src/components/Spacing.js → src/components/old/Spacing.jsrenamed

The content is the same.

src/components/StatelessTransaction.js → src/components/old/StatelessTransaction.jsrenamed+11−11

@@ -1,17 +1,17 @@

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

22import { Ok } from 'folktale/result';

33import React from 'react';

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

4+import * as need from '../../lib/need';

66import { Code, H3 } from './Base';

77import { Button } from './Base';

88import { CheckboxButton, Input, InnerLabel, InnerLabelDropdown } from './Base';

99import { Warning } from './Base';

1010

11−import { BRIDGE_ERROR } from '../lib/error';

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

13−import { compose } from '../lib/lib';

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

11+import { BRIDGE_ERROR } from '../../lib/error';

12+import { ROUTE_NAMES } from '../../lib/routeNames';

13+import { compose } from '../../lib/lib';

14+import * as tank from '../../lib/tank';

1515import {

1616 sendSignedTransaction,

1717 fromWei,

@@ -19,13 +19,13 @@ import {

1919 hexify,

2020 renderSignedTx,

2121 signTransaction,

22−} from '../lib/txn';

22+} from '../../lib/txn';

2323

24−import { withTxnConfirmations } from '../store/txnConfirmations';

25−import { withNetwork } from '../store/network';

26−import { withHistory } from '../store/history';

27−import { withWallet } from '../store/wallet';

28−import { withTxnCursor } from '../store/txnCursor';

24+import { withTxnConfirmations } from '../../store/txnConfirmations';

25+import { withNetwork } from '../../store/network';

26+import { withHistory } from '../../store/history';

27+import { withWallet } from '../../store/wallet';

28+import { withTxnCursor } from '../../store/txnCursor';

2929

3030const SUBMISSION_STATES = {

3131 PROMPT: 'Send transaction',

src/components/Textarea.js → src/components/old/Textarea.jsrenamed

The content is the same.

src/components/UploadButton.js → src/components/old/UploadButton.jsrenamed

The content is the same.

src/components/ValidatedBlockie.js → src/components/old/ValidatedBlockie.jsrenamed

The content is the same.

src/components/ValidatedSigil.js → src/components/old/ValidatedSigil.jsrenamed

The content is the same.

src/components/Warning.js → src/components/old/Warning.jsrenamed

The content is the same.

src/components/advancedInput.js → src/components/old/advancedInput.jsrenamed+1−1

@@ -1,7 +1,7 @@

11import React, { Component } from 'react';

22import PropTypes from 'prop-types';

4−import { compose, defaultTo, t, f } from '../lib/lib';

4+import { compose, defaultTo, t, f } from '../../lib/lib';

66// =============================================================================

77// Utils

src/views/AcceptTransfer.js+3−3

@@ -1,17 +1,17 @@

11import { Just } from 'folktale/maybe';

22import React from 'react';

3−import { Row, Col, H1, P } from '../components/Base';

3+import { Row, Col, H1, P } from '../components/old/Base';

44import {

55 InnerLabel,

66 AddressInput,

77 ShowBlockie,

88 Anchor,

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

9+} from '../components/old/Base';

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

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

1212import * as need from '../lib/need';

1313

14−import StatelessTransaction from '../components/StatelessTransaction';

14+import StatelessTransaction from '../components/old/StatelessTransaction';

1515import { NETWORK_TYPES } from '../lib/network';

1616import { isValidAddress } from '../lib/wallet';

1717import { withNetwork } from '../store/network';

src/views/CancelTransfer.js+2−2

@@ -1,11 +1,11 @@

11import Maybe from 'folktale/maybe';

22import React from 'react';

3−import { Row, Col, H1, P } from '../components/Base';

3+import { Row, Col, H1, P } from '../components/old/Base';

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

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

66import * as need from '../lib/need';

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

8+import StatelessTransaction from '../components/old/StatelessTransaction';

99import { ETH_ZERO_ADDR } from '../lib/wallet';

1010import { withNetwork } from '../store/network';

1111import { compose } from '../lib/lib';

src/views/CreateGalaxy.js+4−4

@@ -4,16 +4,16 @@ import * as azimuth from 'azimuth-js';

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

55import * as need from '../lib/need';

7−import { Button } from '../components/Base';

8−import { Row, Col, H1, P, Anchor } from '../components/Base';

7+import { Button } from '../components/old/Base';

8+import { Row, Col, H1, P, Anchor } from '../components/old/Base';

99import {

1010 InnerLabel,

1111 GalaxyInput,

1212 AddressInput,

1313 ValidatedSigil,

1414 ShowBlockie,

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

16−import StatelessTransaction from '../components/StatelessTransaction';

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

16+import StatelessTransaction from '../components/old/StatelessTransaction';

1717

1818import { NETWORK_TYPES } from '../lib/network';

1919import { canDecodePatp } from '../lib/txn';

src/views/GenKeyfile.js+2−2

@@ -1,8 +1,8 @@

11import React from 'react';

22import * as need from '../lib/need';

4−import { Button } from '../components/Base';

5−import { Row, Col, H1, P } from '../components/Base';

4+import { Button } from '../components/old/Base';

5+import { Row, Col, H1, P } from '../components/old/Base';

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

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

src/views/InviteTicket.js+1−1

@@ -9,7 +9,7 @@ import {

99 Row,

1010 Col,

1111 Passport,

12−} from '../components/Base';

12+} from '../components/old/Base';

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

1414import * as need from '../lib/need';

1515

src/views/InvitesManage.js+2−2

@@ -12,8 +12,8 @@ import {

1212 PointInput,

1313 InnerLabel,

1414 ValidatedSigil,

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

16−import StatelessTransaction from '../components/StatelessTransaction';

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

16+import StatelessTransaction from '../components/old/StatelessTransaction';

1717import { withNetwork } from '../store/network';

1818import { compose } from '../lib/lib';

1919import { withPointCursor } from '../store/pointCursor';

src/views/InvitesSend.js+1−1

@@ -4,7 +4,7 @@ import * as azimuth from 'azimuth-js';

44import * as need from '../lib/need';

66import { hasReceived, sendMail } from '../lib/inviteMail';

7−import { Row, Col, Button, Input, H3, Warning } from '../components/Base';

7+import { Row, Col, Button, Input, H3, Warning } from '../components/old/Base';

99// for wallet generation

1010import * as wg from '../_walletgen/lib/lib';

src/views/IssueChild.js+2−2

@@ -15,9 +15,9 @@ import {

1515 PointInput,

1616 AddressInput,

1717 InnerLabel,

18−} from '../components/Base';

18+} from '../components/old/Base';

1919

20−import StatelessTransaction from '../components/StatelessTransaction';

20+import StatelessTransaction from '../components/old/StatelessTransaction';

2121

2222import { NETWORK_TYPES } from '../lib/network';

2323import { getSpawnCandidate } from '../lib/child';

src/views/Keystore.js+3−3

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

22import { Ok, Error } from 'folktale/result';

33import React from 'react';

44import * as keythereum from 'keythereum';

5−import { Button, UploadButton } from '../components/Base';

6−import { Input, InnerLabel, InputCaption } from '../components/Base';

7−import { Row, Col, H1, H3, Warning } from '../components/Base';

5+import { Button, UploadButton } from '../components/old/Base';

6+import { Input, InnerLabel, InputCaption } from '../components/old/Base';

7+import { Row, Col, H1, H3, Warning } from '../components/old/Base';

99import { BRIDGE_ERROR } from '../lib/error';

1010import { ROUTE_NAMES } from '../lib/routeNames';

src/views/Landing.js+3−3

@@ -1,7 +1,7 @@

11import React from 'react';

2−import { Button } from '../components/Base';

3−import { Row, Col } from '../components/Base';

4−import { H1, P } from '../components/Base';

2+import { Button } from '../components/old/Base';

3+import { Row, Col } from '../components/old/Base';

4+import { H1, P } from '../components/old/Base';

66import { ROUTE_NAMES } from '../lib/routeNames';

77import { useHistory } from '../store/history';

src/views/Ledger.js+3−3

@@ -1,9 +1,9 @@

11import * as bip32 from 'bip32';

22import React from 'react';

33import Maybe from 'folktale/maybe';

4−import { Button } from '../components/Base';

5−import { Row, Col, H1, P, H2 } from '../components/Base';

6−import { Input, InnerLabel, InnerLabelDropdown } from '../components/Base';

4+import { Button } from '../components/old/Base';

5+import { Row, Col, H1, P, H2 } from '../components/old/Base';

6+import { Input, InnerLabel, InnerLabelDropdown } from '../components/old/Base';

77import Transport from '@ledgerhq/hw-transport-u2f';

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

99import * as secp256k1 from 'secp256k1';

src/views/Mnemonic.js+3−3

@@ -1,14 +1,14 @@

11import * as bip39 from 'bip39';

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

33import React from 'react';

4−import { Button } from '../components/Base';

4+import { Button } from '../components/old/Base';

55import {

66 Input,

77 MnemonicInput,

88 InnerLabel,

99 InputCaption,

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

11−import { Row, Col, H1 } from '../components/Base';

10+} from '../components/old/Base';

11+import { Row, Col, H1 } from '../components/old/Base';

1212

1313import { ROUTE_NAMES } from '../lib/routeNames';

1414import { withHistory } from '../store/history';

src/views/Network.js+3−3

@@ -1,8 +1,8 @@

11import React from 'react';

3−import { Button } from '../components/Base';

4−import { InnerLabelDropdown } from '../components/Base';

5−import { Row, Col, H1, P } from '../components/Base';

3+import { Button } from '../components/old/Base';

4+import { InnerLabelDropdown } from '../components/old/Base';

5+import { Row, Col, H1, P } from '../components/old/Base';

66import { NETWORK_TYPES, renderNetworkType } from '../lib/network';

77import { ROUTE_NAMES } from '../lib/routeNames';

88import { useHistory } from '../store/history';

src/views/Point.js+3−3

@@ -5,11 +5,11 @@ import * as ob from 'urbit-ob';

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

66import * as need from '../lib/need';

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

9−import ReactSVGComponents from '../components/ReactSVGComponents';

8+import PointList from '../components/old/PointList';

9+import ReactSVGComponents from '../components/old/ReactSVGComponents';

1010import KeysAndMetadata from './Point/KeysAndMetadata';

1111import Actions from './Point/Actions';

12−import { Row, Col, H1, H3 } from '../components/Base';

12+import { Row, Col, H1, H3 } from '../components/old/Base';

1313import { withHistory } from '../store/history';

1414import { withNetwork } from '../store/network';

1515import { compose } from '../lib/lib';

src/views/Point/Actions.js+2−2

@@ -3,8 +3,8 @@ import { azimuth } from 'azimuth-js';

33import * as need from '../../lib/need';

55import { ETH_ZERO_ADDR, CURVE_ZERO_ADDR, eqAddr } from '../../lib/wallet';

6−import { Row, Col, H2, P } from '../../components/Base';

7−import { Button } from '../../components/Base';

6+import { Row, Col, H2, P } from '../../components/old/Base';

7+import { Button } from '../../components/old/Base';

88import { ROUTE_NAMES } from '../../lib/routeNames';

99import { useHistory } from '../../store/history';

1010import { useWallet } from '../../store/wallet';

src/views/Point/KeysAndMetadata.js+1−1

@@ -1,5 +1,5 @@

11import React from 'react';

2−import { Row, Col, H2, H4 } from '../../components/Base';

2+import { Row, Col, H2, H4 } from '../../components/old/Base';

44import { ETH_ZERO_ADDR, eqAddr } from '../../lib/wallet';

src/views/Points.js+3−3

@@ -1,9 +1,9 @@

11import React from 'react';

2−import { Row, Col, H1, H2, P } from '../components/Base';

3−import { Button } from '../components/Base';

2+import { Row, Col, H1, H2, P } from '../components/old/Base';

3+import { Button } from '../components/old/Base';

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

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

6+import PointList from '../components/old/PointList';

77import { NETWORK_TYPES } from '../lib/network';

88import { ROUTE_NAMES } from '../lib/routeNames';

99import { withHistory } from '../store/history';

src/views/PrivateKey.js+7−3

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

11import Maybe from 'folktale/maybe';

22import React from 'react';

3−import { Button } from '../components/Base';

4−import { RequiredInput, InnerLabel, InputCaption } from '../components/Base';

5−import { Row, Col, H1 } from '../components/Base';

3+import { Button } from '../components/old/Base';

4+import {

5+ RequiredInput,

6+ InnerLabel,

7+ InputCaption,

8+} from '../components/old/Base';

9+import { Row, Col, H1 } from '../components/old/Base';

610

711import { ROUTE_NAMES } from '../lib/routeNames';

812import { withHistory } from '../store/history';

src/views/SentTransaction.js+2−2

@@ -1,8 +1,8 @@

11import Maybe from 'folktale/maybe';

22import React from 'react';

33import * as need from '../lib/need';

4−import { Row, Col, H1, H3, P, Warning, Anchor } from '../components/Base';

5−import { Button } from '../components/Base';

4+import { Row, Col, H1, H3, P, Warning, Anchor } from '../components/old/Base';

5+import { Button } from '../components/old/Base';

77import { ROUTE_NAMES } from '../lib/routeNames';

88import { useHistory } from '../store/history';

src/views/SetKeys.js+10−3

@@ -4,9 +4,16 @@ import * as azimuth from 'azimuth-js';

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

55import * as need from '../lib/need';

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

7−import { Row, Col, H1, P, Warning, CheckboxButton } from '../components/Base';

8−

9−import StatelessTransaction from '../components/StatelessTransaction';

7+import {

8+ Row,

9+ Col,

10+ H1,

11+ P,

12+ Warning,

13+ CheckboxButton,

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

15+

16+import StatelessTransaction from '../components/old/StatelessTransaction';

1017import { attemptNetworkSeedDerivation } from '../lib/keys';

1118

1219import { addHexPrefix } from '../lib/wallet';

src/views/SetProxy.js+3−3

@@ -11,15 +11,15 @@ import {

1111 ShowBlockie,

1212 Anchor,

1313 HorizontalSelector,

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

15−import { AddressInput } from '../components/Base';

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

15+import { AddressInput } from '../components/old/Base';

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

1717

1818import { PROXY_TYPE, renderProxyType } from '../lib/proxy';

1919

2020import { NETWORK_TYPES } from '../lib/network';

2121

22−import StatelessTransaction from '../components/StatelessTransaction';

22+import StatelessTransaction from '../components/old/StatelessTransaction';

2323

2424import { isValidAddress } from '../lib/wallet';

2525import { withNetwork } from '../store/network';

src/views/Shards.js+3−3

@@ -1,6 +1,6 @@

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

22import React from 'react';

3−import { Button } from '../components/Base';

3+import { Button } from '../components/old/Base';

44import {

55 InnerLabel,

66 ValidatedSigil,

@@ -8,8 +8,8 @@ import {

88 ShardInput,

99 InputCaption,

1010 Input,

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

12−import { Row, Col, H1, P } from '../components/Base';

11+} from '../components/old/Base';

12+import { Row, Col, H1, P } from '../components/old/Base';

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

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

1515

src/views/Ticket.js+3−3

@@ -1,6 +1,6 @@

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

22import React from 'react';

3−import { Button } from '../components/Base';

3+import { Button } from '../components/old/Base';

44import {

55 InnerLabel,

66 ValidatedSigil,

@@ -8,8 +8,8 @@ import {

88 TicketInput,

99 Input,

1010 InputCaption,

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

12−import { Row, Col, H1, P } from '../components/Base';

11+} from '../components/old/Base';

12+import { Row, Col, H1, P } from '../components/old/Base';

1313

1414import { randomPatq, compose } from '../lib/lib';

1515import { ROUTE_NAMES } from '../lib/routeNames';

src/views/Transfer.js+3−3

@@ -12,9 +12,9 @@ import {

1212 ShowBlockie,

1313 P,

1414 Anchor,

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

16−import { AddressInput } from '../components/Base';

17−import StatelessTransaction from '../components/StatelessTransaction';

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

16+import { AddressInput } from '../components/old/Base';

17+import StatelessTransaction from '../components/old/StatelessTransaction';

1818

1919import { NETWORK_TYPES } from '../lib/network';

2020

src/views/Trezor.js+3−3

@@ -1,9 +1,9 @@

11import * as bip32 from 'bip32';

22import React from 'react';

33import Maybe from 'folktale/maybe';

4−import { Button } from '../components/Base';

5−import { Row, Col, H1, P } from '../components/Base';

6−import { InnerLabel, Input, InnerLabelDropdown } from '../components/Base';

4+import { Button } from '../components/old/Base';

5+import { Row, Col, H1, P } from '../components/old/Base';

6+import { InnerLabel, Input, InnerLabelDropdown } from '../components/old/Base';

77import TrezorConnect from 'trezor-connect';

88import * as secp256k1 from 'secp256k1';

src/views/ViewPoint.js+3−3

@@ -2,9 +2,9 @@ import Maybe from 'folktale/maybe';

22import React from 'react';

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

5−import { Button } from '../components/Base';

6−import { Row, Col, H1, P } from '../components/Base';

7−import { InnerLabel, PointInput, ValidatedSigil } from '../components/Base';

5+import { Button } from '../components/old/Base';

6+import { Row, Col, H1, P } from '../components/old/Base';

7+import { InnerLabel, PointInput, ValidatedSigil } from '../components/old/Base';

99import { ROUTE_NAMES } from '../lib/routeNames';

1010import { withHistory } from '../store/history';

src/views/Wallet.js+3−3

@@ -1,8 +1,8 @@

11import Maybe from 'folktale/maybe';

22import React from 'react';

3−import { Button, H1, P } from '../components/Base';

4−import { InnerLabelDropdown } from '../components/Base';

5−import { Row, Col } from '../components/Base';

3+import { Button, H1, P } from '../components/old/Base';

4+import { InnerLabelDropdown } from '../components/old/Base';

5+import { Row, Col } from '../components/old/Base';

77import { ROUTE_NAMES } from '../lib/routeNames';

88import { withHistory } from '../store/history';