Skip to content

Commit 50755be

Browse files
Schwartz10Schwartz10
authored
Merge pull request #524 from openworklabs/dev
* Feat/post interview fixes (#523) * Bump version
2 parents bcd2896 + 43ebcb8 commit 50755be

File tree

7 files changed

+148
-27
lines changed

7 files changed

+148
-27
lines changed

‎components/AccountSelector/__snapshots__/index.test.js.snap‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,14 @@ exports[`AccountSelector it renders the wallets in redux with the investor copy
12811281
>
12821282
Please select the Ledger account you wish to own and sign for your multisig investor wallet.
12831283
</p>
1284+
<p
1285+
class="c7"
1286+
font-family="RT-Alias-Grotesk"
1287+
font-size="2"
1288+
font-weight="400"
1289+
>
1290+
Any of these accounts can accept Filecoin. If in doubt, select account 0.
1291+
</p>
12841292
</li>
12851293
</ul>
12861294
<ul

‎components/AccountSelector/index.jsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,16 @@ const AccountSelector = ({ premainnetInvestor, msig }) => {
206206
</MenuItem>
207207
<MenuItem>
208208
{premainnetInvestor && (
209-
<Text>
210-
Please select the Ledger account you wish to own and sign
211-
for your multisig investor wallet.
212-
</Text>
209+
<>
210+
<Text>
211+
Please select the Ledger account you wish to own and sign
212+
for your multisig investor wallet.
213+
</Text>
214+
<Text>
215+
Any of these accounts can accept Filecoin. If in doubt,
216+
select account 0.
217+
</Text>
218+
</>
213219
)}
214220
{msig && (
215221
<Text>

‎components/Investor/Home.jsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,12 @@ const PostConfirm = ({ investorString }) => {
153153
return (
154154
<>
155155
<StepHeader currentStep={5} totalSteps={5} Icon={IconLedger} />
156+
<Title mt={3}>Almost done!</Title>
156157
<Text>
157-
All set! Please log in to your CoinList account and paste this string in
158-
exactly how it appears.
158+
Please log in to your CoinList account and paste this string in exactly
159+
how it appears.
159160
</Text>
161+
<Text>You do not need to save this magic string.</Text>
160162
<Box display='flex' flexDirection='column' alignItems='flex-end'>
161163
<Copy
162164
onClick={() => {

‎components/Investor/__snapshots__/index.test.js.snap‎

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
810810
height: 8px;
811811
}
812812
813-
.c16 {
813+
.c17 {
814814
min-width: 0;
815815
box-sizing: border-box;
816816
margin-top: 48px;
@@ -829,7 +829,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
829829
justify-content: space-between;
830830
}
831831
832-
.c12 {
832+
.c13 {
833833
min-width: 0;
834834
box-sizing: border-box;
835835
display: -webkit-box;
@@ -845,7 +845,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
845845
align-items: flex-end;
846846
}
847847
848-
.c17 {
848+
.c18 {
849849
cursor: pointer;
850850
border: 1px solid #262626;
851851
background-color: transparent;
@@ -865,11 +865,11 @@ exports[`investor Home it sends the magic string to PL 1`] = `
865865
border-radius: 4px;
866866
}
867867
868-
.c17:hover {
868+
.c18:hover {
869869
opacity: 0.8;
870870
}
871871
872-
.c18 {
872+
.c19 {
873873
cursor: pointer;
874874
border: 1px solid #1AD08F;
875875
background-color: #1AD08F;
@@ -889,7 +889,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
889889
border-radius: 4px;
890890
}
891891
892-
.c18:hover {
892+
.c19:hover {
893893
opacity: 0.8;
894894
}
895895
@@ -898,6 +898,15 @@ exports[`investor Home it sends the magic string to PL 1`] = `
898898
height: 40px;
899899
}
900900
901+
.c11 {
902+
font-size: 1.5rem;
903+
font-weight: 400;
904+
line-height: 1.2;
905+
font-family: RT-Alias-Grotesk;
906+
margin: 0;
907+
margin-top: 16px;
908+
}
909+
901910
.c8 {
902911
color: #262626;
903912
font-size: 1.125rem;
@@ -909,14 +918,14 @@ exports[`investor Home it sends the magic string to PL 1`] = `
909918
margin-bottom: 0;
910919
}
911920
912-
.c11 {
921+
.c12 {
913922
font-size: 1.125rem;
914923
font-weight: 400;
915924
line-height: 1.4;
916925
font-family: RT-Alias-Grotesk;
917926
}
918927
919-
.c14 {
928+
.c15 {
920929
background-color: #E4EBFC;
921930
font-size: 1.125rem;
922931
font-weight: 400;
@@ -958,7 +967,7 @@ exports[`investor Home it sends the magic string to PL 1`] = `
958967
justify-content: space-between;
959968
}
960969
961-
.c13 {
970+
.c14 {
962971
width: -webkit-fit-content;
963972
width: -moz-fit-content;
964973
width: fit-content;
@@ -970,12 +979,12 @@ exports[`investor Home it sends the magic string to PL 1`] = `
970979
margin: 0;
971980
}
972981
973-
.c13:hover {
982+
.c14:hover {
974983
cursor: pointer;
975984
border-bottom: 2px solid #5E26FF;
976985
}
977986
978-
.c15 {
987+
.c16 {
979988
word-break: break-all;
980989
}
981990
@@ -1115,27 +1124,43 @@ exports[`investor Home it sends the magic string to PL 1`] = `
11151124
</div>
11161125
</li>
11171126
</ul>
1118-
<p
1127+
<h2
11191128
class="c11"
11201129
font-family="RT-Alias-Grotesk"
1130+
font-size="4"
1131+
font-weight="400"
1132+
>
1133+
Almost done!
1134+
</h2>
1135+
<p
1136+
class="c12"
1137+
font-family="RT-Alias-Grotesk"
11211138
font-size="2"
11221139
font-weight="400"
11231140
>
1124-
All set! Please log in to your CoinList account and paste this string in exactly how it appears.
1141+
Please log in to your CoinList account and paste this string in exactly how it appears.
11251142
</p>
1126-
<div
1143+
<p
11271144
class="c12"
1145+
font-family="RT-Alias-Grotesk"
1146+
font-size="2"
1147+
font-weight="400"
1148+
>
1149+
You do not need to save this magic string.
1150+
</p>
1151+
<div
1152+
class="c13"
11281153
display="flex"
11291154
>
11301155
<p
1131-
class="c13"
1156+
class="c14"
11321157
color="core.primary"
11331158
font-size="3"
11341159
>
11351160
Copy string
11361161
</p>
11371162
<p
1138-
class="c14 c15"
1163+
class="c15 c16"
11391164
font-family="RT-Alias-Grotesk"
11401165
font-size="2"
11411166
font-weight="400"
@@ -1145,20 +1170,20 @@ exports[`investor Home it sends the magic string to PL 1`] = `
11451170
</div>
11461171
</div>
11471172
<div
1148-
class="c16"
1173+
class="c17"
11491174
display="flex"
11501175
width="100%"
11511176
>
11521177
<button
1153-
class="c17"
1178+
class="c18"
11541179
font-size="3"
11551180
height="6"
11561181
type="button"
11571182
>
11581183
Back
11591184
</button>
11601185
<button
1161-
class="c18"
1186+
class="c19"
11621187
font-size="3"
11631188
height="6"
11641189
type="button"

‎components/Onboarding/Configure/Ledger/Step2.jsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
OnboardCard,
1010
Text,
1111
Title,
12-
StepHeader
12+
StepHeader,
13+
StyledATag
1314
} from '../../../Shared'
1415
import { IconLedger } from '../../../Shared/Icons'
1516

@@ -76,6 +77,13 @@ const Step2Helper = ({
7677
<Box color='core.nearblack' mt={3}>
7778
<Text>Please unlock your Ledger device.</Text>
7879
<Text>And make sure the Filecoin App is open</Text>
80+
<StyledATag
81+
target='_blank'
82+
rel='noopener noreferrer'
83+
href='https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF'
84+
>
85+
Click here for installation instructions.
86+
</StyledATag>
7987
</Box>
8088
</>
8189
)}

‎components/Onboarding/Configure/Ledger/__snapshots__/index.test.js.snap‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3451,6 +3451,20 @@ exports[`Ledger configuration Step2 it renders msig step2 correctly, with the ri
34513451
justify-content: space-between;
34523452
}
34533453
3454+
.c16 {
3455+
-webkit-text-decoration: none;
3456+
text-decoration: none;
3457+
-webkit-transition: 0.18s ease-in-out;
3458+
transition: 0.18s ease-in-out;
3459+
border-bottom: 2px solid #5E26FF00;
3460+
color: #5E26FF;
3461+
font-size: 1.25rem;
3462+
}
3463+
3464+
.c16:hover {
3465+
border-bottom: 2px solid #5E26FF;
3466+
}
3467+
34543468
<div
34553469
class="c0"
34563470
display="inline-block"
@@ -3587,6 +3601,16 @@ exports[`Ledger configuration Step2 it renders msig step2 correctly, with the ri
35873601
>
35883602
And make sure the Filecoin App is open
35893603
</p>
3604+
<a
3605+
class="c16"
3606+
color="core.primary"
3607+
font-size="3"
3608+
href="https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF"
3609+
rel="noopener noreferrer"
3610+
target="_blank"
3611+
>
3612+
Click here for installation instructions.
3613+
</a>
35903614
</div>
35913615
</div>
35923616
</div>
@@ -3788,6 +3812,20 @@ exports[`Ledger configuration Step2 it renders normal wallet step2 correctly, wi
37883812
justify-content: space-between;
37893813
}
37903814
3815+
.c15 {
3816+
-webkit-text-decoration: none;
3817+
text-decoration: none;
3818+
-webkit-transition: 0.18s ease-in-out;
3819+
transition: 0.18s ease-in-out;
3820+
border-bottom: 2px solid #5E26FF00;
3821+
color: #5E26FF;
3822+
font-size: 1.25rem;
3823+
}
3824+
3825+
.c15:hover {
3826+
border-bottom: 2px solid #5E26FF;
3827+
}
3828+
37913829
<div
37923830
class="c0"
37933831
display="inline-block"
@@ -3913,6 +3951,16 @@ exports[`Ledger configuration Step2 it renders normal wallet step2 correctly, wi
39133951
>
39143952
And make sure the Filecoin App is open
39153953
</p>
3954+
<a
3955+
class="c15"
3956+
color="core.primary"
3957+
font-size="3"
3958+
href="https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF"
3959+
rel="noopener noreferrer"
3960+
target="_blank"
3961+
>
3962+
Click here for installation instructions.
3963+
</a>
39163964
</div>
39173965
</div>
39183966
</div>
@@ -4126,6 +4174,20 @@ exports[`Ledger configuration Step2 it renders premainnet saft step2 correctly,
41264174
justify-content: space-between;
41274175
}
41284176
4177+
.c16 {
4178+
-webkit-text-decoration: none;
4179+
text-decoration: none;
4180+
-webkit-transition: 0.18s ease-in-out;
4181+
transition: 0.18s ease-in-out;
4182+
border-bottom: 2px solid #5E26FF00;
4183+
color: #5E26FF;
4184+
font-size: 1.25rem;
4185+
}
4186+
4187+
.c16:hover {
4188+
border-bottom: 2px solid #5E26FF;
4189+
}
4190+
41294191
<div
41304192
class="c0"
41314193
display="inline-block"
@@ -4284,6 +4346,16 @@ exports[`Ledger configuration Step2 it renders premainnet saft step2 correctly,
42844346
>
42854347
And make sure the Filecoin App is open
42864348
</p>
4349+
<a
4350+
class="c16"
4351+
color="core.primary"
4352+
font-size="3"
4353+
href="https://paper.dropbox.com/doc/Install-the-Filecoin-App-on-your-Ledger-Device--A7wuBpET2_FTgmjTLebkfmSAAg-FFy4WD4kcYPNjuw4V1PQF"
4354+
rel="noopener noreferrer"
4355+
target="_blank"
4356+
>
4357+
Click here for installation instructions.
4358+
</a>
42874359
</div>
42884360
</div>
42894361
</div>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "filecoin-web-wallet",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"scripts": {
55
"dev": "next",
66
"build": "next build",

0 commit comments

Comments
 (0)