c8f19a8 · bridge · git.iko.soy

src/bridge/Bridge.js+3−1

compare with master

unifiedsplit

@@ -22,7 +22,9 @@ import { BRIDGE_ERROR } from './lib/error';

22

23const initWeb3 = networkType => {

24 if (networkType === NETWORK_NAMES.MAINNET) {

25− const endpoint = `https://mainnet.infura.io/v3/${process.env.REACT_APP_INFURA_ENDPOINT}`;

25+ const endpoint = `https://mainnet.infura.io/v3/${

26+ process.env.REACT_APP_INFURA_ENDPOINT

27+ }`;

26

28

27 const provider = new Web3.providers.HttpProvider(endpoint);

29 const provider = new Web3.providers.HttpProvider(endpoint);

28 const web3 = new Web3(provider);

30 const web3 = new Web3(provider);

src/bridge/components/DropdownItem.js+3−1

@@ -10,7 +10,9 @@ const DropdownItem = props => {

10 <button

11 disabled={props.disabled}

12 style={props.style}

13− className={`h-10 m-0 p-0 ph-2 bg-white flex align-center items-start bs-solid brw-2 blw-2 btw-0 bbw-0 sans ${_disabled} ${props.className}`}

13+ className={`h-10 m-0 p-0 ph-2 bg-white flex align-center items-start bs-solid brw-2 blw-2 btw-0 bbw-0 sans ${_disabled} ${

14+ props.className

15+ }`}

14 onClick={props.onClick}>

16 onClick={props.onClick}>

15 {props.children}

17 {props.children}

16 </button>

18 </button>

src/bridge/components/HorizontalSelector.js+3−1

@@ -22,7 +22,9 @@ class HorizontalSelector extends React.Component {

22 let active = opt.value === this.state.option ? 'btn-primary active' : '';

23 return (

24 <button

25− className={`btn ${active} h-10 ph-4 flex sans ${this.props.className}`}

25+ className={`btn ${active} h-10 ph-4 flex sans ${

26+ this.props.className

27+ }`}

26 value={opt.value}

28 value={opt.value}

27 onClick={() => this.selectOption(opt.value)}>

29 onClick={() => this.selectOption(opt.value)}>

28 {opt.title}

30 {opt.title}

src/bridge/components/Passport.js+3−5

@@ -37,7 +37,7 @@ class Passport extends React.Component {

37

38 let className = filled ? 'passport-block bg-gray-30' : 'passport-block';

39

40− blocks.push(<div key={i} data-key={i} className={className}></div>);

40+ blocks.push(<div key={i} data-key={i} className={className} />);

41 });

42

43 return <div className="flex flex-wrap passport-censor">{blocks}</div>;

@@ -77,9 +77,7 @@ class Passport extends React.Component {

77

78 return (

79 <div className="passport-wallet-progress" style={progressStyle}>

80− {progressDone && (

81− <div className="passport-wallet-progress-fill"></div>

80+ {progressDone && <div className="passport-wallet-progress-fill" />}

82− )}

83 </div>

81 </div>

84 );

82 );

85 });

83 });

@@ -137,7 +135,7 @@ class Passport extends React.Component {

137 size: 128,

135 size: 128,

138 })

136 })

139 ) : (

137 ) : (

140− <div className="passport-sigil-blank"></div>

138+ <div className="passport-sigil-blank" />

141 );

139 );

142

140

143 let currentDate = this.getCurrentDate();

141 let currentDate = this.getCurrentDate();

src/bridge/components/StatelessTransaction.js+5−3

@@ -455,7 +455,8 @@ class StatelessTransaction extends React.Component {

455 title={'Chain ID'}

456 options={chainOptions}

457 handleUpdate={handleChainUpdate}

458− currentSelectionTitle={chainDialogueTitle}></InnerLabelDropdown>

458+ currentSelectionTitle={chainDialogueTitle}

459+ />

459 );

460 );

460

461

461 const customChainDialogue = !customChain ? null : (

462 const customChainDialogue = !customChain ? null : (

@@ -509,7 +510,8 @@ class StatelessTransaction extends React.Component {

509 disabled={!canApprove}

510 disabled={!canApprove}

510 onToggle={setUserApproval}

511 onToggle={setUserApproval}

511 state={userApproval}

512 state={userApproval}

512− label="I approve this transaction and wish to send."></CheckboxButton>

513+ label="I approve this transaction and wish to send."

514+ />

513 );

515 );

514

516

515 const sending = txStatus !== SUBMISSION_STATES.PROMPT;

517 const sending = txStatus !== SUBMISSION_STATES.PROMPT;

@@ -521,7 +523,7 @@ class StatelessTransaction extends React.Component {

521 disabled={!canSend || sending}

523 disabled={!canSend || sending}

522 onClick={sendTxn}>

524 onClick={sendTxn}>

523 <span className="relative">

525 <span className="relative">

524− <span className={`btn-spinner ${sendTxnSpinner}`}></span>

526+ <span className={`btn-spinner ${sendTxnSpinner}`} />

525 {txStatus}

527 {txStatus}

526 </span>

528 </span>

527 </Button>

529 </Button>

src/bridge/components/icons/Chevron.js+3−1

@@ -4,7 +4,9 @@ import PropTypes from 'prop-types';

4const 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>`}

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="${

8+ props.color

9+ }" stroke-width="${props.strokeWidth}" fill="${props.color}"/></svg>`}

8 alt=""

10 alt=""

9 style={props.style}

11 style={props.style}

10 className={props.className}

12 className={props.className}

src/bridge/views/InviteTicket.js+2−1

@@ -237,7 +237,8 @@ class InviteTicket extends React.Component {

237 <div className="passport-progress mb-2">

238 <div

239 className="passport-progress-filled"

240− style={{ width: progressWidth }}></div>

240+ style={{ width: progressWidth }}

241+ />

241 </div>

242 </div>

242 <div className="flex justify-between">

243 <div className="flex justify-between">

243 <div className="text-mono text-sm lh-6 green-dark">

244 <div className="text-mono text-sm lh-6 green-dark">

src/bridge/views/InvitesSend.js+2−1

@@ -433,7 +433,8 @@ class InvitesSend extends React.Component {

433 this.handleEmailInput(i, value);

434 }}

435 placeholder={'Email address'}

436− disabled={inputDisabled}></Input>

436+ disabled={inputDisabled}

437+ />

437 {target.hasReceived.matchWith({

438 {target.hasReceived.matchWith({

438 Nothing: () => null,

439 Nothing: () => null,

439 Just: has =>

440 Just: has =>

src/bridge/views/Ledger.js+4−2

@@ -106,7 +106,8 @@ class Ledger extends React.Component {

106 handleUpdate={handlePathSelection}

107 title={'Derivation path'}

108 currentSelectionTitle={basePathTitle}

109− fullWidth={true}></InnerLabelDropdown>

109+ fullWidth={true}

110+ />

110 );

111 );

111

112

112 const truePathSelection =

113 const truePathSelection =

@@ -130,7 +131,8 @@ class Ledger extends React.Component {

130 handleUpdate={handleAccountSelection}

131 handleUpdate={handleAccountSelection}

131 title={'Account'}

132 title={'Account'}

132 currentSelectionTitle={accountTitle}

133 currentSelectionTitle={accountTitle}

133− fullWidth={true}></InnerLabelDropdown>

134+ fullWidth={true}

135+ />

134 );

136 );

135

137

136 return (

138 return (

src/bridge/views/Network.js+8−5

@@ -34,7 +34,9 @@ class Network extends React.Component {

34 if (network === NETWORK_NAMES.ROPSTEN) {

35 setNetworkType(network);

36

37− const endpoint = `https://ropsten.infura.io/v3/${process.env.REACT_APP_INFURA_ENDPOINT}`;

37+ const endpoint = `https://ropsten.infura.io/v3/${

38+ process.env.REACT_APP_INFURA_ENDPOINT

39+ }`;

38

40

39 const provider = new Web3.providers.HttpProvider(endpoint);

41 const provider = new Web3.providers.HttpProvider(endpoint);

40 const web3 = new Web3(provider);

42 const web3 = new Web3(provider);

@@ -46,7 +48,9 @@ class Network extends React.Component {

46 if (network === NETWORK_NAMES.MAINNET) {

48 if (network === NETWORK_NAMES.MAINNET) {

47 setNetworkType(network);

49 setNetworkType(network);

48

50

49− const endpoint = `https://mainnet.infura.io/v3/${process.env.REACT_APP_INFURA_ENDPOINT}`;

51+ const endpoint = `https://mainnet.infura.io/v3/${

52+ process.env.REACT_APP_INFURA_ENDPOINT

53+ }`;

50

54

51 const provider = new Web3.providers.HttpProvider(endpoint);

55 const provider = new Web3.providers.HttpProvider(endpoint);

52 const web3 = new Web3(provider);

56 const web3 = new Web3(provider);

@@ -127,9 +131,8 @@ class Network extends React.Component {

127 title={'Node:'}

131 title={'Node:'}

128 handleUpdate={this.handleNetworkChange}

132 handleUpdate={this.handleNetworkChange}

129 options={networkOptions}

133 options={networkOptions}

130− currentSelectionTitle={renderNetworkType(

134+ currentSelectionTitle={renderNetworkType(networkType)}

131− networkType

135+ />

132− )}></InnerLabelDropdown>

133

136

134 <Button

137 <Button

135 className={'mt-10'}

138 className={'mt-10'}

src/bridge/views/SetKeys.js+2−1

@@ -177,7 +177,8 @@ class SetKeys extends React.Component {

177 state={state.discontinuity}

178 label={`I have lost important off-chain data relating to this point

179 and need to do a hard reset.

180− (For example, rebooting an Arvo ship.)`}></CheckboxButton>

180+ (For example, rebooting an Arvo ship.)`}

181+ />

181

182

182 <StatelessTransaction

183 <StatelessTransaction

183 // Upper scope

184 // Upper scope

src/bridge/views/Ticket.js+1−1

@@ -131,7 +131,7 @@ class Ticket extends React.Component {

131 this.walletFromTicket(ticket, pointName, passphrase)

132 }>

133 <span className="relative">

134− {this.state.isUnlocking && <span className="btn-spinner"></span>}

134+ {this.state.isUnlocking && <span className="btn-spinner" />}

135 {'Unlock Wallet →'}

136 </span>

137 </Button>

src/bridge/views/Trezor.js+2−1

@@ -87,7 +87,8 @@ class Trezor extends React.Component {

87 handleUpdate={handleAccountSelection}

88 title={'Account'}

89 currentSelectionTitle={accountTitle}

90− fullWidth={true}></InnerLabelDropdown>

90+ fullWidth={true}

91+ />

91 );

92 );

92

93

93 const pathSelection =

94 const pathSelection =

src/bridge/views/Wallet.js+2−3

@@ -71,9 +71,8 @@ class Wallet extends React.Component {

71 title={'Wallet Type:'}

72 options={walletOptions}

73 handleUpdate={props.setWalletType}

74− currentSelectionTitle={renderWalletType(

74+ currentSelectionTitle={renderWalletType(props.walletType)}

75− props.walletType

75+ />

76− )}></InnerLabelDropdown>

77

76

78 <Button

77 <Button

79 className={'mt-10'}

78 className={'mt-10'}

src/walletgen/views/Generate.js+4−4

@@ -380,26 +380,26 @@ class Generate extends React.Component {

380

381 <div className="col-md-3 col-md-offset-1 mt-9">

382 <div className="fixed" style={{ width: '230px' }}>

383− <div className="col-md-12 bg-very-high h-2 mt-4"></div>

383+ <div className="col-md-12 bg-very-high h-2 mt-4" />

384 <h4 className="text-600 mt-2">Very High Friction</h4>

385 <p className="text-sm" style={{ lineHeight: '16px' }}>

386 Extremely valuable. Cold storage on a 3 part sharded paper wallet.

387 Store each shard in a separate geographic location with protection

388 against fire, water and other elements.

389 </p>

390− <div className="col-md-12 bg-high h-2 mt-4"></div>

390+ <div className="col-md-12 bg-high h-2 mt-4" />

391 <h4 className="text-600 mt-2">High Friction</h4>

392 <p className="text-sm" style={{ lineHeight: '16px' }}>

393 Very valuable. Cold storage on a paper wallet in a different

394 location than your computer, such as a safe.

395 </p>

396− <div className="col-md-12 bg-medium h-2 mt-4"></div>

396+ <div className="col-md-12 bg-medium h-2 mt-4" />

397 <h4 className="text-600 mt-2">Medium Friction</h4>

398 <p className="text-sm" style={{ lineHeight: '16px' }}>

399 Store cold in a paper wallet; can be stored in a desk drawer in a

400 trusted environment.

401 </p>

402− <div className="col-md-12 bg-low h-2 mt-4"></div>

402+ <div className="col-md-12 bg-low h-2 mt-4" />

403 <h4 className="text-600 mt-2">Low Friction</h4>

404 <p className="text-sm" style={{ lineHeight: '16px' }}>

405 Ok to store hot on a trusted networked computer.