git.iko.soy/bridge
on master help sign in
activation flow: copy changes

fixes urbit/bridge#871

commite58e493ac68ee31c212c3538c8ce389962632150 authorJames Acklin <james@tlon.io> dateFri 21 Jan 2022, 17:37 (5 years ago) parentd675c03
7 files changed+66−25
compare with master
unifiedsplit
src/views/Activate/ActivateCode.tsx+36−3 src/views/Activate/DownloadPortButton.tsx+3−3 src/views/Activate/MasterKeyConfirm.tsx+2−2 src/views/Activate/MasterKeyDownload.tsx+3−3 src/views/Activate/MasterKeyReveal.tsx+2−2 src/views/Activate/MasterKeyTransfer.tsx+15−3 src/views/Disclaimer.js+5−9
src/views/Activate/ActivateCode.tsx+36−3
@@ -39,12 +39,45 @@ export default function ActivateCode() {
3939 <View inset hideBack>
4040 <ActivateView
4141 hideBack={hasInitialValues}
42− header={<ActivateHeader content={'Planet Code'} />}
42+ header={
43+ <ActivateHeader
44+ content={
45+ hasInitialValues
46+ ? 'Welcome. This is your Urbit ID.'
47+ : 'Activate a Planet'
48+ }
49+ />
50+ }
4351 footer={<ActivateCodeForm afterSubmit={goToMasterKey} />}>
4452 <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+ ) : (
4679 <Box className="mb2 sans gray5" fontSize={14}>
47− Enter your planet code below
80+ Enter your planet activation code below.
4881 </Box>
4982 )}
5083 {impliedPatp ? (
src/views/Activate/DownloadPortButton.tsx+3−3
@@ -9,10 +9,10 @@ interface DownloadPortButtonProps {
99export const DownloadPortButton = ({ error }: DownloadPortButtonProps) => {
1010 const downloadButtonLabel = useMemo(() => {
1111 return isMacOs
12− ? 'Download the Client for Mac'
12+ ? 'To use it, download Port for Mac'
1313 : isWindows
14− ? 'Download the Client for Windows'
15− : 'Download the Client for Your OS';
14+ ? 'To use it, download Port for Windows'
15+ : 'To use it, download Port for your OS';
1616 }, []);
1717
1818 const downloadUrl = useMemo(() => {
src/views/Activate/MasterKeyConfirm.tsx+2−2
@@ -81,7 +81,7 @@ const MasterKeyConfirm = () => {
8181 <ActivateHeader content={'Confirm Backup'} />
8282 <ActivateParagraph
8383 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.'
8585 }
8686 />
8787 </Box>
@@ -150,7 +150,7 @@ const MasterKeyConfirm = () => {
150150 {showError && (
151151 <Box>
152152 <Text className="error-message">
153− The Master Ticket you entered is incorrect
153+ The Master Ticket you entered is incorrect.
154154 </Text>
155155 </Box>
156156 )}
src/views/Activate/MasterKeyDownload.tsx+3−3
@@ -78,10 +78,10 @@ const MasterKeyDownload = () => {
7878 const header = useMemo(() => {
7979 return (
8080 <Box>
81− <ActivateHeader content={'Backup your Master Ticket.'} />
81+ <ActivateHeader content={'Back up your Master Ticket.'} />
8282 <ActivateParagraph
8383 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.'
8585 }
8686 />
8787 </Box>
@@ -135,7 +135,7 @@ const MasterKeyDownload = () => {
135135 <DangerBox
136136 overrideFadeIn={triggerAnimation && isIn}
137137 className={`mv8 ${!isIn ? 'hidden' : ''}`}>
138− Do not share this with anyone else!
138+ Never share your Master Ticket with anyone.
139139 </DangerBox>
140140 {ticket && (
141141 <MasterKeyPresenter ticket={ticket} overrideFadeIn={true} />
src/views/Activate/MasterKeyReveal.tsx+2−2
@@ -34,10 +34,10 @@ const MasterKeyReveal = () => {
3434 const header = useMemo(() => {
3535 return (
3636 <Box>
37− <ActivateHeader content={'Here is your Master Ticket.'} />
37+ <ActivateHeader content={'This is your Master Ticket.'} />
3838 <ActivateParagraph
3939 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."
4141 }
4242 />
4343 </Box>
src/views/Activate/MasterKeyTransfer.tsx+15−3
@@ -39,7 +39,12 @@ const MasterKeyTransfer = () => {
3939 console.error(e);
4040 setError(e);
4141 }
42− }, [inviteMasterTicketWallet, performL2Reticket, derivedPoint.value, sendWallet.value]);
42+ }, [
43+ inviteMasterTicketWallet,
44+ performL2Reticket,
45+ derivedPoint.value,
46+ sendWallet.value,
47+ ]);
4348
4449 useFadeIn();
4550
@@ -59,7 +64,7 @@ const MasterKeyTransfer = () => {
5964 fontWeight={'600'}
6065 fontSize={'16px'}
6166 lineHeight={'24px'}>
62− Congratulations
67+ Congratulations,
6368 </Text>
6469 <Text
6570 fontFamily="Source Code Pro"
@@ -74,7 +79,7 @@ const MasterKeyTransfer = () => {
7479 fontWeight={'600'}
7580 fontSize={'16px'}
7681 lineHeight={'24px'}>
77− is now yours
82+ is now yours.
7883 </Text>
7984 </>
8085 }
@@ -105,6 +110,13 @@ const MasterKeyTransfer = () => {
105110 rel={'nofollow noopener'}>
106111 or setup via command line
107112 </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>
108120 </Box>
109121 );
110122 }, [error]);
src/views/Disclaimer.js+5−9
@@ -41,13 +41,12 @@ export default function ActivateDisclaimer() {
4141 </Grid.Item>
4242 <Grid.Item full>
4343 <Text className={cn(TEXT_STYLE, 'block mb4')}>
44− Welcome to Bridge. Please read this information. Your assets could
45− be stolen if you do not pay attention to these warnings.
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.
4645 </Text>
4746
4847 <Text className={cn(TEXT_STYLE, 'block mb4')}>
4948 <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.
5150 </Text>
5251
5352 <B className={TEXT_STYLE}>Please understand that nobody can:</B>
@@ -59,17 +58,17 @@ export default function ActivateDisclaimer() {
5958 </Text>
6059
6160 <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:
6362 </B>
6463 <Text className={cn(TEXT_STYLE, 'block mb4')}>
6564 1. Private Keys/Mnemonic Phrases and passwords <br />
6665 2. JSON files <br />
6766 3. Hardware wallet PINs; <br />
6867 4. Downloading this software from a reliable site, and ensuring it
69− has not been tampered with.
68+ has not been tampered with
7069 </Text>
7170
72− <B className={TEXT_STYLE}>To be clear</B>
71+ <B className={TEXT_STYLE}>To be clear:</B>
7372 <Text className={cn(TEXT_STYLE, 'block')}>
7473 This software is provided “as is” without warranties of any kind and
7574 our liability to you in connection with the same is limited;
@@ -80,9 +79,6 @@ export default function ActivateDisclaimer() {
8079 problems that may arise in connection with your wallet.
8180 </Text>
8281 </Grid.Item>
83− <Grid.Item full as={WarningBox}>
84− Warning: Nobody but you can restore or reset your Master Ticket
85− </Grid.Item>
8682 <BridgeForm
8783 validate={validate}
8884 afterSubmit={goNext}