Merge pull request #524 from openworklabs/dev

* Feat/post interview fixes (#523) * Bump version
glifio · Sep 16, 2020 · 50755be · 50755be
2 parents bcd2896 + 43ebcb8
commit 50755be
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 27 deletions.
diff --git a/components/AccountSelector/__snapshots__/index.test.js.snap b/components/AccountSelector/__snapshots__/index.test.js.snap
@@ -1281,6 +1281,14 @@ exports[`AccountSelector it renders the wallets in redux with the investor copy
         >
           Please select the Ledger account you wish to own and sign for your multisig investor wallet.
         </p>
+        <p
+          class="c7"
+          font-family="RT-Alias-Grotesk"
+          font-size="2"
+          font-weight="400"
+        >
+          Any of these accounts can accept Filecoin. If in doubt, select account 0.
+        </p>
       </li>
     </ul>
     <ul

diff --git a/components/AccountSelector/index.jsx b/components/AccountSelector/index.jsx
@@ -206,10 +206,16 @@ const AccountSelector = ({ premainnetInvestor, msig }) => {
               </MenuItem>
               <MenuItem>
                 {premainnetInvestor && (
-                  <Text>
-                    Please select the Ledger account you wish to own and sign
-                    for your multisig investor wallet.
-                  </Text>
+                  <>
+                    <Text>
+                      Please select the Ledger account you wish to own and sign
+                      for your multisig investor wallet.
+                    </Text>
+                    <Text>
+                      Any of these accounts can accept Filecoin. If in doubt,
+                      select account 0.
+                    </Text>
+                  </>
                 )}
                 {msig && (
                   <Text>

diff --git a/components/Investor/Home.jsx b/components/Investor/Home.jsx
@@ -153,10 +153,12 @@ const PostConfirm = ({ investorString }) => {
   return (
     <>
       <StepHeader currentStep={5} totalSteps={5} Icon={IconLedger} />
+      <Title mt={3}>Almost done!</Title>
       <Text>
-        All set! Please log in to your CoinList account and paste this string in
-        exactly how it appears.
+        Please log in to your CoinList account and paste this string in exactly
+        how it appears.
       </Text>
+      <Text>You do not need to save this magic string.</Text>
       <Box display='flex' flexDirection='column' alignItems='flex-end'>
         <Copy
           onClick={() => {

diff --git a/components/Investor/__snapshots__/index.test.js.snap b/components/Investor/__snapshots__/index.test.js.snap
@@ -810,7 +810,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   height: 8px;
 }
 
-.c16 {
+.c17 {
   min-width: 0;
   box-sizing: border-box;
   margin-top: 48px;
@@ -829,7 +829,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   justify-content: space-between;
 }
 
-.c12 {
+.c13 {
   min-width: 0;
   box-sizing: border-box;
   display: -webkit-box;
@@ -845,7 +845,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   align-items: flex-end;
 }
 
-.c17 {
+.c18 {
   cursor: pointer;
   border: 1px solid #262626;
   background-color: transparent;
@@ -865,11 +865,11 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   border-radius: 4px;
 }
 
-.c17:hover {
+.c18:hover {
   opacity: 0.8;
 }
 
-.c18 {
+.c19 {
   cursor: pointer;
   border: 1px solid #1AD08F;
   background-color: #1AD08F;
@@ -889,7 +889,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   border-radius: 4px;
 }
 
-.c18:hover {
+.c19:hover {
   opacity: 0.8;
 }
 
@@ -898,6 +898,15 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   height: 40px;
 }
 
+.c11 {
+  font-size: 1.5rem;
+  font-weight: 400;
+  line-height: 1.2;
+  font-family: RT-Alias-Grotesk;
+  margin: 0;
+  margin-top: 16px;
+}
+
 .c8 {
   color: #262626;
   font-size: 1.125rem;
@@ -909,14 +918,14 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   margin-bottom: 0;
 }
 
-.c11 {
+.c12 {
   font-size: 1.125rem;
   font-weight: 400;
   line-height: 1.4;
   font-family: RT-Alias-Grotesk;
 }
 
-.c14 {
+.c15 {
   background-color: #E4EBFC;
   font-size: 1.125rem;
   font-weight: 400;
@@ -958,7 +967,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   justify-content: space-between;
 }
 
-.c13 {
+.c14 {
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -970,12 +979,12 @@ exports[`investor Home it sends the magic string to PL 1`] = `
   margin: 0;
 }
 
-.c13:hover {
+.c14:hover {
   cursor: pointer;
   border-bottom: 2px solid #5E26FF;
 }
 
-.c15 {
+.c16 {
   word-break: break-all;
 }
 
@@ -1115,27 +1124,43 @@ exports[`investor Home it sends the magic string to PL 1`] = `
         </div>
       </li>
     </ul>
-    <p
+    <h2
       class="c11"
       font-family="RT-Alias-Grotesk"
+      font-size="4"
+      font-weight="400"
+    >
+      Almost done!
+    </h2>
+    <p
+      class="c12"
+      font-family="RT-Alias-Grotesk"
       font-size="2"
       font-weight="400"
     >
-      All set! Please log in to your CoinList account and paste this string in exactly how it appears.
+      Please log in to your CoinList account and paste this string in exactly how it appears.
     </p>
-    <div
+    <p
       class="c12"
+      font-family="RT-Alias-Grotesk"
+      font-size="2"
+      font-weight="400"
+    >
+      You do not need to save this magic string.
+    </p>
+    <div
+      class="c13"
       display="flex"
     >
       <p
-        class="c13"
+        class="c14"
         color="core.primary"
         font-size="3"
       >
         Copy string
       </p>
       <p
-        class="c14 c15"
+        class="c15 c16"
         font-family="RT-Alias-Grotesk"
         font-size="2"
         font-weight="400"
@@ -1145,20 +1170,20 @@ exports[`investor Home it sends the magic string to PL 1`] = `
     </div>
   </div>
   <div
-    class="c16"
+    class="c17"
     display="flex"
     width="100%"
   >
     <button
-      class="c17"
+      class="c18"
       font-size="3"
       height="6"
       type="button"
     >
       Back
     </button>
     <button
-      class="c18"
+      class="c19"
       font-size="3"
       height="6"
       type="button"

diff --git a/components/Onboarding/Configure/Ledger/Step2.jsx b/components/Onboarding/Configure/Ledger/Step2.jsx
@@ -9,7 +9,8 @@ import {
   OnboardCard,
   Text,
   Title,
-  StepHeader
+  StepHeader,
+  StyledATag
 } from '../../../Shared'
 import { IconLedger } from '../../../Shared/Icons'
 
@@ -76,6 +77,13 @@ const Step2Helper = ({
         <Box color='core.nearblack' mt={3}>
           <Text>Please unlock your Ledger device.</Text>
           <Text>And make sure the Filecoin App is open</Text>
+          <StyledATag
+            target='_blank'
+            rel='noopener noreferrer'
+            href='https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF'
+          >
+            Click here for installation instructions.
+          </StyledATag>
         </Box>
       </>
     )}

diff --git a/components/Onboarding/Configure/Ledger/__snapshots__/index.test.js.snap b/components/Onboarding/Configure/Ledger/__snapshots__/index.test.js.snap
@@ -3451,6 +3451,20 @@ exports[`Ledger configuration Step2 it renders msig step2 correctly, with the ri
   justify-content: space-between;
 }
 
+.c16 {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  -webkit-transition: 0.18s ease-in-out;
+  transition: 0.18s ease-in-out;
+  border-bottom: 2px solid #5E26FF00;
+  color: #5E26FF;
+  font-size: 1.25rem;
+}
+
+.c16:hover {
+  border-bottom: 2px solid #5E26FF;
+}
+
 <div
   class="c0"
   display="inline-block"
@@ -3587,6 +3601,16 @@ exports[`Ledger configuration Step2 it renders msig step2 correctly, with the ri
       >
         And make sure the Filecoin App is open
       </p>
+      <a
+        class="c16"
+        color="core.primary"
+        font-size="3"
+        href="https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Click here for installation instructions.
+      </a>
     </div>
   </div>
 </div>
@@ -3788,6 +3812,20 @@ exports[`Ledger configuration Step2 it renders normal wallet step2 correctly, wi
   justify-content: space-between;
 }
 
+.c15 {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  -webkit-transition: 0.18s ease-in-out;
+  transition: 0.18s ease-in-out;
+  border-bottom: 2px solid #5E26FF00;
+  color: #5E26FF;
+  font-size: 1.25rem;
+}
+
+.c15:hover {
+  border-bottom: 2px solid #5E26FF;
+}
+
 <div
   class="c0"
   display="inline-block"
@@ -3913,6 +3951,16 @@ exports[`Ledger configuration Step2 it renders normal wallet step2 correctly, wi
       >
         And make sure the Filecoin App is open
       </p>
+      <a
+        class="c15"
+        color="core.primary"
+        font-size="3"
+        href="https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Click here for installation instructions.
+      </a>
     </div>
   </div>
 </div>
@@ -4126,6 +4174,20 @@ exports[`Ledger configuration Step2 it renders premainnet saft step2 correctly,
   justify-content: space-between;
 }
 
+.c16 {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  -webkit-transition: 0.18s ease-in-out;
+  transition: 0.18s ease-in-out;
+  border-bottom: 2px solid #5E26FF00;
+  color: #5E26FF;
+  font-size: 1.25rem;
+}
+
+.c16:hover {
+  border-bottom: 2px solid #5E26FF;
+}
+
 <div
   class="c0"
   display="inline-block"
@@ -4284,6 +4346,16 @@ exports[`Ledger configuration Step2 it renders premainnet saft step2 correctly,
       >
         And make sure the Filecoin App is open
       </p>
+      <a
+        class="c16"
+        color="core.primary"
+        font-size="3"
+        href="https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Click here for installation instructions.
+      </a>
     </div>
   </div>
 </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filecoin-web-wallet",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "scripts": {
     "dev": "next",
     "build": "next build",