f890ffa · bridge · git.iko.soy

git.iko.soy/bridge

Merge pull request #333 from urbit/mino-visual-fixes

Visual fixes

commitf890ffaa861a752553b12310f5525275b36cfd26 authorAnthony Arroyo <anthony@tlon.io> dateWed 6 Nov 2019, 14:04 (7 years ago) parentace9aee a106ae4

6 files changed+28−22

compare with master

unifiedsplit

src/components/Buttons.js+2−2 src/components/Passport.js−1 src/views/Activate/ActivatePassport.js+1−4 src/views/Admin/AdminNetworkingKeys.js+2−2 src/views/Invite/InviteEmail.js+10−1 src/views/Point.js+13−12

src/components/Buttons.js+2−2

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

2424 </OutButton>

2525);

2626

27−export const BootArvoButton = props => (

27+export const BootUrbitOSButton = props => (

2828 <OutButton

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

3030 detail="Boot your computer"

3131 {...props}>

32− Boot Arvo

32+ Boot Urbit OS

3333 </OutButton>

3434);

src/components/Passport.js−1

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

1111

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

1313

14−import Sigil from './Sigil';

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

1615

1716function makeSigil(size, patp, colors) {

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

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

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

22import cn from 'classnames';

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

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

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

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

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

4343 });

4444

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

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

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

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

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

5047

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

5249 const address = useMemo(

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

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

2525import useKeyfileGenerator from 'lib/useKeyfileGenerator';

2626

2727import ViewHeader from 'components/ViewHeader';

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

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

2929import FooterButton from 'components/FooterButton';

3030import DownloadKeyfileButton from 'components/DownloadKeyfileButton';

3131import InlineEthereumTransaction from 'components/InlineEthereumTransaction';

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

385385

386386 {completed && (

387387 <>

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

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

389389 <Grid.Divider />

390390 </>

391391 )}

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

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

378378 if (errorString !== '') {

379379 throw new Error(errorString);

380380 }

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+ ]);

382391

383392 const onSubmit = useCallback(

384393 async values => {

src/views/Point.js+13−12

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

99import View from 'components/View';

1010import Greeting from 'components/Greeting';

1111import Passport from 'components/Passport';

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

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

1313import CopyButton from 'components/CopyButton';

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

1515import DownloadSigilButton from 'components/DownloadSigilButton';

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

113113 Admin

114114 </Grid.Item>

115115 <Grid.Divider />

116− <Grid.Item

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 />

116+

126117 {isParent && (

127118 <>

128119 <Grid.Item

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

135126 <Grid.Divider />

136127 </>

137128 )}

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>

139140 <Grid.Divider />

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

141142 <Grid.Divider />