git.iko.soy/bridge
on master help sign in
activation flow: copy changes
e58e493James Acklin
src/views/Activate/ActivateCode.tsx+36−3
compare with master
unifiedsplit
@@ -39,12 +39,45 @@ export default function ActivateCode() {
39 <View inset hideBack>
39 <View inset hideBack>
40 <ActivateView
40 <ActivateView
41 hideBack={hasInitialValues}
41 hideBack={hasInitialValues}
42+ header={
42− header={<ActivateHeader content={'Planet Code'} />}
43+ <ActivateHeader
44+ content={
45+ hasInitialValues
46+ ? 'Welcome. This is your Urbit ID.'
47+ : 'Activate a Planet'
48+ }
49+ />
50+ }
43 footer={<ActivateCodeForm afterSubmit={goToMasterKey} />}>
51 footer={<ActivateCodeForm afterSubmit={goToMasterKey} />}>
44 <Box className="flex-col align-center justify-center w-full h-full">
52 <Box className="flex-col align-center justify-center w-full h-full">
45− {!hasInitialValues && (
53+ {hasInitialValues ? (
54+ <Box>
55+ <p
56+ className="mb2 sans gray5"
57+ style={{
58+ fontSize: 14,
59+ textAlign: 'center',
60+ maxWidth: '38ch',
61+ marginLeft: 'auto',
62+ }}>
63+ An Urbit ID is your unique identity that you use to communicate
64+ on Urbit. You own it forever.
65+ </p>
66+ <p
67+ className="mb2 sans gray5"
68+ style={{
69+ fontSize: 14,
70+ textAlign: 'center',
71+ maxWidth: '38ch',
72+ marginLeft: 'auto',
73+ }}>
74+ To activate your Urbit ID, begin by claiming it via the link
75+ below.
76+ </p>
77+ </Box>
78+ ) : (
46 <Box className="mb2 sans gray5" fontSize={14}>
79 <Box className="mb2 sans gray5" fontSize={14}>
47− Enter your planet code below
80+ Enter your planet activation code below.
48 </Box>
81 </Box>
49 )}
82 )}
50 {impliedPatp ? (
83 {impliedPatp ? (
src/views/Activate/DownloadPortButton.tsx+3−3
@@ -9,10 +9,10 @@ interface DownloadPortButtonProps {
9export const DownloadPortButton = ({ error }: DownloadPortButtonProps) => {
9export const DownloadPortButton = ({ error }: DownloadPortButtonProps) => {
10 const downloadButtonLabel = useMemo(() => {
10 const downloadButtonLabel = useMemo(() => {
11 return isMacOs
11 return isMacOs
12− ? 'Download the Client for Mac'
12+ ? 'To use it, download Port for Mac'
13 : isWindows
13 : isWindows
14− ? 'Download the Client for Windows'
14+ ? 'To use it, download Port for Windows'
15− : 'Download the Client for Your OS';
15+ : 'To use it, download Port for your OS';
16 }, []);
16 }, []);
17
17
18 const downloadUrl = useMemo(() => {
18 const downloadUrl = useMemo(() => {
src/views/Activate/MasterKeyConfirm.tsx+2−2
@@ -81,7 +81,7 @@ const MasterKeyConfirm = () => {
81 <ActivateHeader content={'Confirm Backup'} />
81 <ActivateHeader content={'Confirm Backup'} />
82 <ActivateParagraph
82 <ActivateParagraph
83 copy={
83 copy={
84− 'Confirm that you have stored your Master Ticket somewhere safe by entering it below'
84+ 'To confirm that you stored your Master Ticket somewhere safe, enter it below.'
85 }
85 }
86 />
86 />
87 </Box>
87 </Box>
@@ -150,7 +150,7 @@ const MasterKeyConfirm = () => {
150 {showError && (
150 {showError && (
151 <Box>
151 <Box>
152 <Text className="error-message">
152 <Text className="error-message">
153− The Master Ticket you entered is incorrect
153+ The Master Ticket you entered is incorrect.
154 </Text>
154 </Text>
155 </Box>
155 </Box>
156 )}
156 )}
src/views/Activate/MasterKeyDownload.tsx+3−3
@@ -78,10 +78,10 @@ const MasterKeyDownload = () => {
78 const header = useMemo(() => {
78 const header = useMemo(() => {
79 return (
79 return (
80 <Box>
80 <Box>
81− <ActivateHeader content={'Backup your Master Ticket.'} />
81+ <ActivateHeader content={'Back up your Master Ticket.'} />
82 <ActivateParagraph
82 <ActivateParagraph
83 copy={
83 copy={
84− 'Download your backup and store it somewhere safe, e.g. your security deposit box or password manager.'
84+ 'Download and store your backup somewhere safe, like a security deposit box or password manager.'
85 }
85 }
86 />
86 />
87 </Box>
87 </Box>
@@ -135,7 +135,7 @@ const MasterKeyDownload = () => {
135 <DangerBox
135 <DangerBox
136 overrideFadeIn={triggerAnimation && isIn}
136 overrideFadeIn={triggerAnimation && isIn}
137 className={`mv8 ${!isIn ? 'hidden' : ''}`}>
137 className={`mv8 ${!isIn ? 'hidden' : ''}`}>
138− Do not share this with anyone else!
138+ Never share your Master Ticket with anyone.
139 </DangerBox>
139 </DangerBox>
140 {ticket && (
140 {ticket && (
141 <MasterKeyPresenter ticket={ticket} overrideFadeIn={true} />
141 <MasterKeyPresenter ticket={ticket} overrideFadeIn={true} />
src/views/Activate/MasterKeyReveal.tsx+2−2
@@ -34,10 +34,10 @@ const MasterKeyReveal = () => {
34 const header = useMemo(() => {
34 const header = useMemo(() => {
35 return (
35 return (
36 <Box>
36 <Box>
37− <ActivateHeader content={'Here is your Master Ticket.'} />
37+ <ActivateHeader content={'This is your Master Ticket.'} />
38 <ActivateParagraph
38 <ActivateParagraph
39 copy={
39 copy={
40− "Your Master Ticket is your 4-word password for your Urbit. Make sure you're in a private place before you reveal it."
40+ "Your Master Ticket is your 4-word password for your Urbit ID. If your Master Ticket is compromised, your Urbit ID is compromised. Before you reveal it, make sure you're somewhere private."
41 }
41 }
42 />
42 />
43 </Box>
43 </Box>
src/views/Activate/MasterKeyTransfer.tsx+15−3
@@ -39,7 +39,12 @@ const MasterKeyTransfer = () => {
39 console.error(e);
39 console.error(e);
40 setError(e);
40 setError(e);
41 }
41 }
42+ }, [
42− }, [inviteMasterTicketWallet, performL2Reticket, derivedPoint.value, sendWallet.value]);
43+ inviteMasterTicketWallet,
44+ performL2Reticket,
45+ derivedPoint.value,
46+ sendWallet.value,
47+ ]);
43
48
44 useFadeIn();
49 useFadeIn();
45
50
@@ -59,7 +64,7 @@ const MasterKeyTransfer = () => {
59 fontWeight={'600'}
64 fontWeight={'600'}
60 fontSize={'16px'}
65 fontSize={'16px'}
61 lineHeight={'24px'}>
66 lineHeight={'24px'}>
62− Congratulations
67+ Congratulations,
63 </Text>
68 </Text>
64 <Text
69 <Text
65 fontFamily="Source Code Pro"
70 fontFamily="Source Code Pro"
@@ -74,7 +79,7 @@ const MasterKeyTransfer = () => {
74 fontWeight={'600'}
79 fontWeight={'600'}
75 fontSize={'16px'}
80 fontSize={'16px'}
76 lineHeight={'24px'}>
81 lineHeight={'24px'}>
77− is now yours
82+ is now yours.
78 </Text>
83 </Text>
79 </>
84 </>
80 }
85 }
@@ -105,6 +110,13 @@ const MasterKeyTransfer = () => {
105 rel={'nofollow noopener'}>
110 rel={'nofollow noopener'}>
106 or setup via command line
111 or setup via command line
107 </Anchor>
112 </Anchor>
113+ <p
114+ className="mb2 sans gray5"
115+ style={{ fontSize: 14, textAlign: 'center' }}>
116+ You need your bootkey to boot your Urbit ID. You can find your bootkey
117+ inside the Passport you downloaded. A computer running on the Urbit
118+ network is called a ship.
119+ </p>
108 </Box>
120 </Box>
109 );
121 );
110 }, [error]);
122 }, [error]);
src/views/Disclaimer.js+5−9
@@ -41,13 +41,12 @@ export default function ActivateDisclaimer() {
41 </Grid.Item>
41 </Grid.Item>
42 <Grid.Item full>
42 <Grid.Item full>
43 <Text className={cn(TEXT_STYLE, 'block mb4')}>
43 <Text className={cn(TEXT_STYLE, 'block mb4')}>
44− Welcome to Bridge. Please read this information. Your assets could
44+ Welcome to Bridge. Please read this information. Your Urbit ID is considered a digital asset. You must secure it. If you do not pay attention to these warnings, your digital assets could be stolen or compromised.
45− be stolen if you do not pay attention to these warnings.
46 </Text>
45 </Text>
47
46
48 <Text className={cn(TEXT_STYLE, 'block mb4')}>
47 <Text className={cn(TEXT_STYLE, 'block mb4')}>
49 <B>You own and control your assets. We do not.</B> If you send your
48 <B>You own and control your assets. We do not.</B> If you send your
50− assets to another address, we can’t get them back for you.
49+ assets to another address, we canot get them back for you.
51 </Text>
50 </Text>
52
51
53 <B className={TEXT_STYLE}>Please understand that nobody can:</B>
52 <B className={TEXT_STYLE}>Please understand that nobody can:</B>
@@ -59,17 +58,17 @@ export default function ActivateDisclaimer() {
59 </Text>
58 </Text>
60
59
61 <B className={TEXT_STYLE}>
60 <B className={TEXT_STYLE}>
62− You’re responsible for keeping your information safe. This includes:
61+ You are responsible for keeping your information safe. This includes:
63 </B>
62 </B>
64 <Text className={cn(TEXT_STYLE, 'block mb4')}>
63 <Text className={cn(TEXT_STYLE, 'block mb4')}>
65 1. Private Keys/Mnemonic Phrases and passwords <br />
64 1. Private Keys/Mnemonic Phrases and passwords <br />
66 2. JSON files <br />
65 2. JSON files <br />
67 3. Hardware wallet PINs; <br />
66 3. Hardware wallet PINs; <br />
68 4. Downloading this software from a reliable site, and ensuring it
67 4. Downloading this software from a reliable site, and ensuring it
69− has not been tampered with.
68+ has not been tampered with
70 </Text>
69 </Text>
71
70
72− <B className={TEXT_STYLE}>To be clear</B>
71+ <B className={TEXT_STYLE}>To be clear:</B>
73 <Text className={cn(TEXT_STYLE, 'block')}>
72 <Text className={cn(TEXT_STYLE, 'block')}>
74 This software is provided “as is” without warranties of any kind and
73 This software is provided “as is” without warranties of any kind and
75 our liability to you in connection with the same is limited;
74 our liability to you in connection with the same is limited;
@@ -80,9 +79,6 @@ export default function ActivateDisclaimer() {
80 problems that may arise in connection with your wallet.
79 problems that may arise in connection with your wallet.
81 </Text>
80 </Text>
82 </Grid.Item>
81 </Grid.Item>
83− <Grid.Item full as={WarningBox}>
84− Warning: Nobody but you can restore or reset your Master Ticket
85− </Grid.Item>
86 <BridgeForm
82 <BridgeForm
87 validate={validate}
83 validate={validate}
88 afterSubmit={goNext}
84 afterSubmit={goNext}