8f40118 · bridge · git.iko.soy

git.iko.soy/bridge

Integrate InputSigil into PointInput

commit8f4011801311c92eed25739d62ca263b249c58f8 authorFang <git@fang.io> dateTue 25 Jun 2019, 19:08 (7 years ago) parent5b762ca

2 files changed+19−11

compare with master

unifiedsplit

src/components/Inputs.js+15 src/views/ViewPoint.js+4−11

src/components/Inputs.js+15

@@ -2,6 +2,8 @@ import React from 'react';

22import { Input } from 'indigo-react';

33import * as bip39 from 'bip39';

5+import InputSigil from 'components/InputSigil';

57import { DEFAULT_HD_PATH } from 'lib/wallet';

68import {

79 validateNotEmpty,

@@ -83,6 +85,19 @@ export function PointInput(props) {

8385 validators={[validatePoint, validateNotEmpty]}

8486 transformers={[prependSig]}

8587 mono

88+ accessory={

89+ <InputSigil

90+ patp={props.initialValue || '~'}

91+ size={68}

92+ margin={8}

93+ pass={props.pass}

94+ onPass={props.setPass}

95+ focused={props.focused}

96+ onFocus={props.setFocused}

97+ error={props.error}

98+ onError={props.setError}

99+ />

100+ }

86101 {...props}

87102 />

88103 );

src/views/ViewPoint.js+4−11

@@ -12,7 +12,6 @@ import { ROUTE_NAMES } from 'lib/routeNames';

1212import View from 'components/View';

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

1414import { PointInput } from 'components/Inputs';

15−import InputSigil from 'components/InputSigil';

1615

1716export default function ViewPoint() {

1817 const history = useHistory();

@@ -38,21 +37,15 @@ export default function ViewPoint() {

3837 <PointInput

3938 name="point"

4039 label="Point Name"

40+ initialValue={pointName}

4141 onValue={setPointName}

42+ pass={pass}

4243 onPass={setPass}

44+ error={error}

4345 onError={setError}

46+ focused={focused}

4447 onFocus={setFocused}

4548 onEnter={goForward}

46− accessory={

47− <InputSigil

48− patp={pointName}

49− size={68}

50− margin={8}

51− pass={pass}

52− focused={focused}

53− error={error}

54− />

55− }

5649 autoFocus

5750 />

5851