f890ffa · bridge · git.iko.soy

src/components/Buttons.js+2−2

compare with master

unifiedsplit

@@ -24,11 +24,11 @@ export const OfflineButton = props => (

24 </OutButton>

25);

26

27−export const BootArvoButton = props => (

27+export const BootUrbitOSButton = props => (

28 <OutButton

29 href="https://urbit.org/docs/getting-started"

30 detail="Boot your computer"

31 {...props}>

32− Boot Arvo

32+ Boot Urbit OS

33 </OutButton>

34);

src/components/Passport.js−1

@@ -11,7 +11,6 @@ import { useSyncOwnedPoints } from 'lib/useSyncPoints';

11

12import { useWallet } from 'store/wallet';

13

14−import Sigil from './Sigil';

15import { sigil, reactRenderer } from 'urbit-sigil-js';

14import { sigil, reactRenderer } from 'urbit-sigil-js';

16

15

17function makeSigil(size, patp, colors) {

16function makeSigil(size, patp, colors) {

src/views/Activate/ActivatePassport.js+1−4

@@ -1,6 +1,6 @@

1import React, { useMemo } from 'react';

2import cn from 'classnames';

3−import { Grid, Flex } from 'indigo-react';

3+import { Grid } from 'indigo-react';

4

5import { LocalRouterProvider, useLocalRouter } from 'lib/LocalRouter';

6

@@ -42,11 +42,8 @@ export default function ActivatePassport() {

42 initialRoutes: [{ key: NAMES.DOWNLOAD }],

43 });

44

45− const fullView = useBreakpoints([false, false, true]);

46 const gap = useBreakpoints([4, 4, 7]);

45 const gap = useBreakpoints([4, 4, 7]);

47 const marginTop = useBreakpoints([false, false, 8]);

46 const marginTop = useBreakpoints([false, false, 8]);

48− const full = useBreakpoints([true, true, false]);

49− const half = useBreakpoints([false, false, true]);

50

47

51 // addresses are not derived until we set[Urbit]Wallet(), so do that inline

48 // addresses are not derived until we set[Urbit]Wallet(), so do that inline

52 const address = useMemo(

49 const address = useMemo(

src/views/Admin/AdminNetworkingKeys.js+2−2

@@ -25,7 +25,7 @@ import { addHexPrefix } from 'lib/wallet';

25import useKeyfileGenerator from 'lib/useKeyfileGenerator';

26

27import ViewHeader from 'components/ViewHeader';

28−import { BootArvoButton } from 'components/Buttons';

28+import { BootUrbitOSButton } from 'components/Buttons';

29import FooterButton from 'components/FooterButton';

30import DownloadKeyfileButton from 'components/DownloadKeyfileButton';

31import InlineEthereumTransaction from 'components/InlineEthereumTransaction';

@@ -385,7 +385,7 @@ export default function AdminNetworkingKeys() {

385

386 {completed && (

387 <>

388− <Grid.Item full as={BootArvoButton} />

388+ <Grid.Item full as={BootUrbitOSButton} />

389 <Grid.Divider />

390 </>

391 )}

src/views/Invite/InviteEmail.js+10−1

@@ -378,7 +378,16 @@ export default function InviteEmail() {

378 if (errorString !== '') {

379 throw new Error(errorString);

380 }

381− }, [web3, wallet, point, gasPrice, invites, clearReceipts, addReceipt]);

381+ }, [

382+ web3,

383+ wallet,

384+ point,

385+ gasPrice,

386+ invites,

387+ clearReceipts,

388+ addReceipt,

389+ sendMail,

390+ ]);

382

391

383 const onSubmit = useCallback(

392 const onSubmit = useCallback(

384 async values => {

393 async values => {

src/views/Point.js+13−12

@@ -9,7 +9,7 @@ import { useWallet } from 'store/wallet';

9import View from 'components/View';

10import Greeting from 'components/Greeting';

11import Passport from 'components/Passport';

12−import { ForwardButton, BootArvoButton } from 'components/Buttons';

12+import { ForwardButton, BootUrbitOSButton } from 'components/Buttons';

13import CopyButton from 'components/CopyButton';

14import { matchBlinky } from 'components/Blinky';

15import DownloadSigilButton from 'components/DownloadSigilButton';

@@ -113,16 +113,7 @@ export default function Point() {

113 Admin

114 </Grid.Item>

115 <Grid.Divider />

116− <Grid.Item

116+

117− full

118− as={ForwardButton}

119− accessory={code && <CopyButton text={code} />}

120− detail={code || notice}

121− disabled={!code}

122− detailClassName="mono">

123− Login Code

124− </Grid.Item>

125− <Grid.Divider />

126 {isParent && (

117 {isParent && (

127 <>

118 <>

128 <Grid.Item

119 <Grid.Item

@@ -135,7 +126,17 @@ export default function Point() {

135 <Grid.Divider />

126 <Grid.Divider />

136 </>

127 </>

137 )}

128 )}

138− <Grid.Item full as={BootArvoButton} />

129+ <Grid.Item full as={BootUrbitOSButton} />

130+ <Grid.Divider />

131+ <Grid.Item

132+ full

133+ as={ForwardButton}

134+ accessory={code && <CopyButton text={code} />}

135+ detail={code || notice}

136+ disabled={!code}

137+ detailClassName="mono">

138+ Login Code

139+ </Grid.Item>

139 <Grid.Divider />

140 <Grid.Divider />

140 <Grid.Item full as={DownloadSigilButton} point={point} />

141 <Grid.Item full as={DownloadSigilButton} point={point} />

141 <Grid.Divider />

142 <Grid.Divider />