git.iko.soy/bridge
on master help sign in
Merge pull request #904 from urbit/james/more-copyfixes
c36c75enerveharp
src/views/Activate/ActivateView.tsx+1−10
compare with master
unifiedsplit
@@ -32,16 +32,7 @@ export default function ActivateView({
32
32
33 return (
33 return (
34 <Grid>
34 <Grid>
35− <Grid.Item
35+ <Grid.Item className="mt10">
36− full
37− as={Text}
38− className="flex justify-center mt9 mb7 w-max-mobile">
39− <Grid.Item as={Text}>Bridge /&nbsp;</Grid.Item>
40− <Grid.Item className="fw-bold" as={Text}>
41− Activate
42− </Grid.Item>
43− </Grid.Item>
44− <Grid.Item>
45 {!hideBack && (
36 {!hideBack && (
46 <HeaderButton
37 <HeaderButton
47 className="mb4"
38 className="mb4"
src/views/Activate/MasterKeyTransfer.tsx+3−3
@@ -113,9 +113,9 @@ const MasterKeyTransfer = () => {
113 <p
113 <p
114 className="mb2 sans gray5"
114 className="mb2 sans gray5"
115 style={{ fontSize: 14, textAlign: 'center' }}>
115 style={{ fontSize: 14, textAlign: 'center' }}>
116− You need your bootkey to boot your Urbit ID. You can find your bootkey
116+ You need your Network Key to boot your Urbit ID. You can find your
117− inside the Passport you downloaded. A computer running on the Urbit
117+ Network Key file inside the Passport you downloaded. A computer
118− network is called a ship.
118+ running on the Urbit network is called a ship.
119 </p>
119 </p>
120 </Box>
120 </Box>
121 );
121 );
src/views/UrbitOS/NetworkKeys.scss+10−10
@@ -6,6 +6,12 @@
6 .body-pane {
6 .body-pane {
7 height: 360px;
7 height: 360px;
8
8
9+ .download {
10+ height: 24px;
11+ width: 24px;
12+ margin: 0 auto 22px;
13+ }
14+
9 .download-message {
15 .download-message {
10 align-items: center;
16 align-items: center;
11 width: 350px;
17 width: 350px;
@@ -15,12 +21,6 @@
15 letter-spacing: 0em;
21 letter-spacing: 0em;
16 text-align: center;
22 text-align: center;
17 margin: 90px auto 40px;
23 margin: 90px auto 40px;
18−
19− .download {
20− height: 24px;
21− width: 24px;
22− margin-bottom: 22px;
23− }
24 }
24 }
25
25
26 .contents {
26 .contents {
@@ -29,24 +29,24 @@
29 display: flex;
29 display: flex;
30 flex-direction: column;
30 flex-direction: column;
31 justify-content: space-between;
31 justify-content: space-between;
32−
32+
33 .check-row {
33 .check-row {
34 margin-top: 8px;
34 margin-top: 8px;
35 font-weight: 500;
35 font-weight: 500;
36−
36+
37 .checkbox {
37 .checkbox {
38 border-radius: $medium-border-radius;
38 border-radius: $medium-border-radius;
39 height: 16px;
39 height: 16px;
40 width: 16px;
40 width: 16px;
41 margin-right: 14px;
41 margin-right: 14px;
42−
42+
43 svg {
43 svg {
44 height: 18px;
44 height: 18px;
45 width: 18px;
45 width: 18px;
46 }
46 }
47 }
47 }
48 }
48 }
49−
49+
50 .info-text {
50 .info-text {
51 color: $dark-gray;
51 color: $dark-gray;
52 margin: 8px 0px 24px 32px;
52 margin: 8px 0px 24px 32px;
src/views/UrbitOS/NetworkKeys.tsx+39−6
@@ -9,7 +9,7 @@ import { Just } from 'folktale/maybe';
9import { Grid, Button } from 'indigo-react';
9import { Grid, Button } from 'indigo-react';
10import * as azimuth from 'azimuth-js';
10import * as azimuth from 'azimuth-js';
11import { randomHex } from 'web3-utils';
11import { randomHex } from 'web3-utils';
12−import { Box, Checkbox, Icon, Row } from '@tlon/indigo-react';
12+import { Box, Checkbox, Icon, Row, Text } from '@tlon/indigo-react';
13
13
14import { usePointCache } from 'store/pointCache';
14import { usePointCache } from 'store/pointCache';
15import { useNetwork } from 'store/network';
15import { useNetwork } from 'store/network';
@@ -280,8 +280,40 @@ export default function UrbitOSNetworkKeys({
280 ? 'Set Network Keys'
280 ? 'Set Network Keys'
281 : 'Initiate Network Keys';
281 : 'Initiate Network Keys';
282
282
283− const usageMessage =
283+ const bootMessage = () => (
284− 'With your new network keys, you also have a new keyfile. Download your new keyfile to boot your OS.';
284+ <Text as="p" textAlign={'center'}>
285+ Download your new Network Key to boot your ship. Be sure to delete your
286+ old pier before booting with this new key.
287+ </Text>
288+ );
289+
290+ const resetMessage = () => (
291+ <>
292+ <Text as="p" textAlign={'center'}>
293+ Copy the contents of the Network Key file and run
294+ </Text>
295+ <Text
296+ as="code"
297+ mono
298+ bg={'washedGray'}
299+ padding={2}
300+ borderRadius={2}
301+ textAlign={'center'}>
302+ |rekey 'keyfile_contents'
303+ </Text>
304+ <Text as="p" textAlign={'center'}>
305+ using the dojo on your running ship.
306+ </Text>
307+ </>
308+ );
309+
310+ const waitMessage = () => (
311+ <Text as="p" textAlign={'center'}>
312+ <strong>Important:</strong> you will need to wait until the next L2 batch
313+ is submitted to the roller to boot your ship. If you do not wait, then you
314+ will not be able to boot your ship.
315+ </Text>
316+ );
285
317
286 const buttonText = `${hasKeys ? 'Reset' : 'Set'} Network Keys`;
318 const buttonText = `${hasKeys ? 'Reset' : 'Set'} Network Keys`;
287
319
@@ -295,9 +327,10 @@ export default function UrbitOSNetworkKeys({
295 <BodyPane>
327 <BodyPane>
296 {isComplete && (
328 {isComplete && (
297 <Box className="flex-col col justify-between h-full">
329 <Box className="flex-col col justify-between h-full">
298− <Box className="flex-col download-message">
330+ <Box className="flex-col h-full justify-center">
299 <Icon icon="Download" className="download" />
331 <Icon icon="Download" className="download" />
300− <Box>{usageMessage}</Box>
332+ {breach ? bootMessage() : resetMessage()}
333+ {breach && point.isL2 ? waitMessage() : null}
301 </Box>
334 </Box>
302 {point.isL2 ? (
335 {point.isL2 ? (
303 <Grid.Item
336 <Grid.Item
@@ -306,7 +339,7 @@ export default function UrbitOSNetworkKeys({
306 solid
339 solid
307 center
340 center
308 onClick={keyfileBind.download}>
341 onClick={keyfileBind.download}>
309− Download Keyfile
342+ Download Network Key
310 </Grid.Item>
343 </Grid.Item>
311 ) : (
344 ) : (
312 <Grid.Item
345 <Grid.Item