47ace0c · bridge · git.iko.soy

git.iko.soy/bridge

Wrap PaperCollateralRenderer

commit47ace0cd3206f65deaae6d136733b9efd08d1c0b authorFang <git@fang.io> dateThu 4 Jul 2019, 01:34 (7 years ago) parent619d158

5 files changed+29−21

compare with master

unifiedsplit

src/components/PaperRenderer.js+13 src/components/old/Passport.js+4−5 src/views/Activate/PassportDownload.js+4−5 src/views/Redownload.js+4−5 src/views/Reticket/Confirm.js+4−6

src/components/PaperRenderer.jsnew file+13

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

1+import React from 'react';

2+import PaperCollateralRenderer from 'PaperCollateralRenderer';

4+export default function PaperRenderer({ point, wallet, callback, ...props }) {

5+ return (

6+ <PaperCollateralRenderer

7+ wallet={{ [point]: wallet }}

8+ callback={callback}

9+ className="super-hidden"

10+ mode="REGISTRATION"

11+ />

12+ );

13+}

src/components/old/Passport.js+4−5

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

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

44import ReactSVGComponents from '../ReactSVGComponents';

55import PropTypes from 'prop-types';

6−import PaperCollateralRenderer from 'PaperCollateralRenderer';

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

7+import PaperRenderer from 'components/PaperRenderer';

99import { WALLET_STATES } from '../../lib/invite';

1010import { downloadWallet } from '../../lib/invite';

@@ -159,14 +159,13 @@ class Passport extends React.Component {

159159 );

160160

161161 let paperCollateral = wallet ? (

162− <PaperCollateralRenderer

163− wallet={{ [pointVal]: wallet }}

164− className={'extremely-hidden'}

162+ <PaperRenderer

163+ point={pointVal}

164+ wallet={wallet}

165165 callback={data => {

166166 this.setState({ paper: data });

167167 this.props.pushWalletState(WALLET_STATES.PAPER_READY);

168168 }}

169− mode={'REGISTRATION'}

170169 />

171170 ) : (

172171 <div />

src/views/Activate/PassportDownload.js+4−5

@@ -2,13 +2,13 @@ import React, { useState, useEffect, useCallback } from 'react';

22import cn from 'classnames';

33import Maybe from 'folktale/maybe';

44import { Grid, H4, P } from 'indigo-react';

5−import PaperCollateralRenderer from 'PaperCollateralRenderer';

76import * as need from 'lib/need';

98import { useActivateFlow } from './ActivateFlow';

109import { downloadWallet } from 'lib/invite';

1110import { DownloadButton, ForwardButton } from 'components/Buttons';

11+import PaperRenderer from 'components/PaperRenderer';

1212import { useLocalRouter } from 'lib/LocalRouter';

1313import Steps from 'components/Steps';

1414

@@ -76,11 +76,10 @@ export default function PassportDownload({ className }) {

7676 solid>

7777 {!downloaded ? 'Download Passport' : 'Continue'}

7878 </Grid.Item>

79− <PaperCollateralRenderer

80− className="abs super-hidden"

81− wallet={{ [pointAsString]: wallet }}

79+ <PaperRenderer

80+ point={pointAsString}

81+ wallet={wallet}

8282 callback={data => setPaper(Maybe.Just(data))}

83− mode="REGISTRATION"

8483 />

8584 </Grid>

8685 );

src/views/Redownload.js+4−5

@@ -6,7 +6,7 @@ import { usePointCursor } from 'store/pointCursor';

77import View from 'components/View';

88import { DownloadButton } from 'components/Buttons';

9−import PaperCollateralRenderer from 'PaperCollateralRenderer';

9+import PaperRenderer from 'components/PaperRenderer';

1010

1111import { downloadWallet } from 'lib/invite';

1212

@@ -24,13 +24,12 @@ export default function Redownload() {

2424 };

2525

2626 const paperRenderer = Just.hasInstance(paper) ? null : (

27− <PaperCollateralRenderer

28− wallet={{ [point]: urbitWallet.value }}

29− className={'extremely-hidden'}

27+ <PaperRenderer

28+ point={point}

29+ wallet={urbitWallet.value}

3030 callback={paper => {

3131 setPaper(Just(paper));

3232 }}

33− mode={'REGISTRATION'}

3433 />

3534 );

3635

src/views/Reticket/Confirm.js+4−6

@@ -2,12 +2,11 @@ import React, { useState } from 'react';

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

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

5−import PaperCollateralRenderer from 'PaperCollateralRenderer';

6−

75import { usePointCursor } from 'store/pointCursor';

97import View from 'components/View';

108import { ForwardButton } from 'components/Buttons';

9+import PaperRenderer from 'components/PaperRenderer';

1110

1211import useLifecycle from 'lib/useLifecycle';

1312import { generateWallet } from 'lib/invite';

@@ -38,13 +37,12 @@ export default function Confirm({ STEP_NAMES, newWallet, storeNewWallet }) {

3837 };

3938

4039 const paperRenderer = Nothing.hasInstance(generatedWallet) ? null : (

41− <PaperCollateralRenderer

42− wallet={{ [point]: generatedWallet.value }}

43− className={'extremely-hidden'}

40+ <PaperRenderer

41+ point={point}

42+ wallet={generatedWallet.value}

4443 callback={paper => {

4544 storeNewWallet(generatedWallet.value, paper);

4645 }}

47− mode={'REGISTRATION'}

4846 />

4947 );

5048