141dac4 · bridge · git.iko.soy

Merge pull request #487 from nathanlever/master

issue-child: validate point child relationship

commit141dac47db88f3f256d766802f19ca73f2ab2780 authorFang <git@fang.io> dateMon 13 Jul 2020, 17:31 (6 years ago) parentd67b9e5 4a2b629

2 files changed+5−1

unifiedsplit

src/lib/validators.js+3

@@ -119,3 +119,6 @@ export const validateUnique = arr => {

119119 const res = [...new Set(arr)].length !== arr.length && 'Must be unique';

120120 return res;

121121};

122+

123+export const validateChild = ourShip => ship =>

124+ ourShip !== ob.sein(ship) && `This point is not a child of ${ourShip}.`;

src/views/IssueChild.js+2−1

@@ -15,6 +15,7 @@ import patp2dec from 'lib/patp2dec';

1515import { getSpawnCandidate } from 'lib/child';

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

1717import useConstant from 'lib/useConstant';

18+import { validateChild } from 'lib/validators';

1819

1920import ViewHeader from 'components/ViewHeader';

2021import InlineEthereumTransaction from 'components/InlineEthereumTransaction';

@@ -111,7 +112,7 @@ export default function IssueChild() {

111112 () =>

112113 composeValidator(

113114 {

114− point: buildPointValidator(4),

115+ point: buildPointValidator(4, [validateChild(ob.patp(_point))]),

115116 owner: buildAddressValidator(),

116117 },

117118 validateForm