8f40118 · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

Integrate InputSigil into PointInput

8f40118Fang7 years ago

src/components/Inputs.js+15

compare with master

unifiedsplit

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

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

3import * as bip39 from 'bip39';

5+import InputSigil from 'components/InputSigil';

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

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

6import {

8import {

7 validateNotEmpty,

9 validateNotEmpty,

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

83 validators={[validatePoint, validateNotEmpty]}

85 validators={[validatePoint, validateNotEmpty]}

84 transformers={[prependSig]}

86 transformers={[prependSig]}

85 mono

87 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+ }

86 {...props}

101 {...props}

87 />

102 />

88 );

103 );

src/views/ViewPoint.js+4−11

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

12import View from 'components/View';

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

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

15−import InputSigil from 'components/InputSigil';

17export default function ViewPoint() {

16export default function ViewPoint() {

18 const history = useHistory();

17 const history = useHistory();

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

38 <PointInput

37 <PointInput

39 name="point"

38 name="point"

40 label="Point Name"

39 label="Point Name"

40+ initialValue={pointName}

41 onValue={setPointName}

42+ pass={pass}

42 onPass={setPass}

43 onPass={setPass}

44+ error={error}

43 onError={setError}

45 onError={setError}

46+ focused={focused}

44 onFocus={setFocused}

47 onFocus={setFocused}

45 onEnter={goForward}

48 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− }

56 autoFocus

49 autoFocus

57 />

50 />