b6873da · bridge · git.iko.soy

src/components/L2/Dropdowns/AccountsDropdown.tsx+1−1

@@ -128,7 +128,7 @@ const AccountsDropdown = ({ showMigrate = false }: AccountsDropdownProps) => {

128128 <Box>

129129 {point.isStar

130130 ? point.isL2Spawn

131− ? 'Generate Invites'

131+ ? 'Create Invites'

132132 : 'Spawn Planets'

133133 : 'Spawn Stars'}

134134 </Box>

src/lib/types/Point.ts+2

@@ -102,6 +102,7 @@ export default class Point {

102102 isVotingProxySet: boolean;

103103 isTransferProxySet: boolean;

104104 canManage: boolean;

105+ couldSpawn: boolean;

105106 canSpawn: boolean;

106107 canTransfer: boolean;

107108 canVote: boolean;

@@ -158,6 +159,7 @@ export default class Point {

158159 this.isTransferProxySet = !isZeroAddress(this.transferProxy);

159160 this.canManage = this.isOwner || this.isManagementProxy;

160161 this.canTransfer = this.isOwner || this.isTransferProxy;

162+ this.couldSpawn = this.isParent && (this.isOwner || this.isSpawnProxy);

161163 this.canSpawn =

162164 this.isParent &&

163165 (this.isOwner || this.isSpawnProxy) &&

src/store/lib/useControlledPointsStore.js+2−2

@@ -64,7 +64,7 @@ export default function useControlledPointsStore() {

6464 spawningPointsL2 === null

6565 ) {

6666 _setControlledPoints(

67− Just(Result.Error('Failed to read the blockchain.'))

67+ JSON.stringify(Just(Result.Error('Failed to read the blockchain.')))

6868 );

6969 } else {

7070 await getPointsDetails(

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

112112 }

113113 } catch (error) {

114114 console.error('failed to fetch controlled points', error);

115− _setControlledPoints(Just(Result.Error(error)));

115+ _setControlledPoints(JSON.stringify(Just(Result.Error(error))));

116116 }

117117 }, [contracts, wallet, getPoints, getPointsDetails]);

118118

src/views/AcceptLockup.js+1−1

@@ -148,7 +148,7 @@ export default function AcceptLockup() {

148148 full

149149 as={InlineEthereumTransaction}

150150 {...bind}

151− onReturn={pop}

151+ onReturn={() => pop()}

152152 />

153153 </Grid>

154154 </View>

src/views/AcceptTransfer.js+1−1

@@ -161,7 +161,7 @@ export default function AcceptTransfer() {

161161 full

162162 as={InlineEthereumTransaction}

163163 {...bind}

164− onReturn={pop}

164+ onReturn={() => pop()}

165165 />

166166 )}

167167 </Grid>

src/views/Adopt.js+1−1

@@ -80,7 +80,7 @@ export default function Adopt() {

8080 full

8181 {...bind}

8282 as={InlineEthereumTransaction}

83− onReturn={pop}

83+ onReturn={() => pop()}

8484 />

8585 </Grid>

8686 </View>

src/views/CancelTransfer.js+1−1

@@ -119,7 +119,7 @@ function AdminCancelTransfer() {

119119 full

120120 as={InlineEthereumTransaction}

121121 {...bind}

122− onReturn={pop}

122+ onReturn={() => pop()}

123123 />

124124 )}

125125 </BodyPane>

src/views/CreateGalaxy.js+1−1

@@ -155,7 +155,7 @@ export default function CreateGalaxy() {

155155 full

156156 as={InlineEthereumTransaction}

157157 {...bind}

158− onReturn={pop}

158+ onReturn={() => pop()}

159159 />

160160 </>

161161 )}

src/views/Invite/Cohort.tsx+1−1

@@ -401,7 +401,7 @@ export default function InviteCohort() {

401401 as={InlineEthereumTransaction}

402402 label="Generate Planet Code"

403403 {...bind}

404− onReturn={pop}

404+ onReturn={() => pop()}

405405 />

406406 )}

407407 </Box>

src/views/Ops/Ops.tsx+1−1

@@ -35,7 +35,7 @@ export const Ops = () => {

3535 ]);

3636

3737 const getButtonContent = () => {

38− if (!point.canSpawn) {

38+ if (!point.couldSpawn) {

3939 return null;

4040 } else if (point.networkKeysSet) {

4141 return (

src/views/Party/PartySetPoolSize.js+1−1

@@ -174,7 +174,7 @@ export default function PartySetPoolSize() {

174174 full

175175 as={InlineEthereumTransaction}

176176 {...bind}

177− onReturn={pop}

177+ onReturn={() => pop()}

178178 />

179179 </>

180180 )}

src/views/Point/IssueChild.tsx+1−1

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

287287 full

288288 as={InlineEthereumTransaction}

289289 {...bind}

290− onReturn={pop}

290+ onReturn={() => pop()}

291291 />

292292 )}

293293 </>

src/views/Point/MigrateL2.tsx+1−1

@@ -250,7 +250,7 @@ export default function MigrateL2() {

250250 transfer ? 'Transfer ship' : 'Set spawn proxy'

251251 } to Layer 2`}

252252 {...bind}

253− onReturn={pop}

253+ onReturn={() => pop()}

254254 />

255255 </Box>

256256 );

src/views/Release/Transfer.js+1−1

@@ -159,7 +159,7 @@ export default function Transfer({ className, goActive }) {

159159 as={InlineEthereumTransaction}

160160 {...bind}

161161 label="Approve Transfer"

162− onReturn={pop}

162+ onReturn={() => pop()}

163163 />

164164 </>

165165 )}

src/views/UrbitID/Home.tsx+9−3

@@ -1,4 +1,5 @@

11import React, { useCallback, useState, useMemo } from 'react';

2+import * as need from 'lib/need';

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

34import { Box, Button, Icon, Row } from '@tlon/indigo-react';

45

@@ -30,9 +31,14 @@ export default function UrbitIDHome() {

3031

3132 const [keysDownloaded, setKeysDownloaded] = useState(false);

3233

33− const _urbitWallet = useMemo(() => urbitWallet.getOrElse(null), [

34− urbitWallet,

35− ]);

34+ const _urbitWallet = useMemo(() => {

35+ try {

36+ const wallet = need.wallet(urbitWallet);

37+ return wallet;

38+ } catch (err) {

39+ return null;

40+ }

41+ }, [urbitWallet]);

3642 const { keyfile, filename } = useKeyfileGenerator();

3743 const [paper, setPaper] = useState(Nothing());

3844

src/views/UrbitID/ResetKeys/ResetConfirm.js+1−1

@@ -79,7 +79,7 @@ export default function ResetConfirm({ newWallet, setNewWallet }) {

7979 full

8080 as={ForwardButton}

8181 solid

82− className="mt4"

82+ className="mt4 ph4"

8383 accessory={blinkIf(Nothing.hasInstance(newWallet))}

8484 disabled={Nothing.hasInstance(newWallet)}

8585 onClick={goDownload}>

src/views/UrbitID/ResetKeys/ResetDownload.js+2−2

@@ -20,14 +20,14 @@ export default function ReticketDownload({ newWallet }) {

2020 const goVerify = useCallback(() => push(names.VERIFY), [push, names]);

2121

2222 return (

23− <Grid className="mt4">

23+ <Grid className="mt4" style={{ width: '100%' }}>

2424 <Grid.Item full as={Text}>

2525 Download the new passport, and keep it somewhere safe!

2626 </Grid.Item>

2727 <Grid.Item

2828 full

2929 as={!downloaded ? DownloadButton : ForwardButton}

30− className="mt4"

30+ className="mt4 ph4"

3131 disabled={Nothing.hasInstance(newWallet)}

3232 onClick={!downloaded ? download : goVerify}

3333 success={downloaded}

src/views/UrbitID/ResetKeys/ResetVerify.js+1−1

@@ -37,7 +37,7 @@ export default function ResetVerify({ newWallet }) {

3737 const goExecute = useCallback(() => push(names.EXECUTE), [push, names]);

3838

3939 return (

40− <Grid className="mt4">

40+ <Grid className="mt4" style={{ width: '100%' }}>

4141 <Grid.Item full as={Text}>

4242 Verify New Master Ticket

4343 </Grid.Item>

src/views/UrbitID/SetProxy.js+1−1

@@ -306,7 +306,7 @@ export default function SetProxy() {

306306 full

307307 as={InlineEthereumTransaction}

308308 {...bind}

309− onReturn={pop}

309+ onReturn={() => pop()}

310310 />

311311 )}

312312 </>

src/views/UrbitID/Transfer.js+1−1

@@ -175,7 +175,7 @@ export default function AdminTransfer() {

175175 full

176176 as={InlineEthereumTransaction}

177177 {...bind}

178− onReturn={pop}

178+ onReturn={() => pop()}

179179 />

180180 )}

181181 </>

src/views/UrbitOS/NetworkingKeys.js+1−1

@@ -359,7 +359,7 @@ export default function UrbitOSNetworkingKeys({

359359 as={InlineEthereumTransaction}

360360 {...bind}

361361 label={`${hasKeys ? 'Reset' : 'Set'} Networking Keys`}

362− onReturn={pop}

362+ onReturn={() => pop()}

363363 />

364364 )}

365365 </Box>