From b3fd9709291f1977248ddf4b60407eacd441e315 Mon Sep 17 00:00:00 2001 From: "Valentin D. Pinkman" Date: Tue, 19 Feb 2019 17:54:22 +0100 Subject: [PATCH 1/2] LL-1017 nano X on manager --- src/components/DashboardPage/index.js | 2 +- src/components/EnsureDeviceApp.js | 5 ++- src/components/GenuineCheck.js | 17 +++++---- src/components/ManagerPage/FirmwareUpdate.js | 14 +++++++- .../ManagerPage/ManagerGenuineCheck.js | 2 +- src/icons/device/NanoX.js | 34 ++++++------------ src/icons/device/NanoXBanner.js | 30 ++++++++++++++++ src/icons/device/index.js | 1 + static/i18n/en/app.json | 8 ++--- static/images/logos/connectDevice.png | Bin 9024 -> 5932 bytes 10 files changed, 74 insertions(+), 39 deletions(-) create mode 100644 src/icons/device/NanoXBanner.js diff --git a/src/components/DashboardPage/index.js b/src/components/DashboardPage/index.js index f3317bb5..02ee3ea3 100644 --- a/src/components/DashboardPage/index.js +++ b/src/components/DashboardPage/index.js @@ -3,7 +3,7 @@ import React, { PureComponent, Fragment } from 'react' import uniq from 'lodash/uniq' import { compose } from 'redux' -import IconNanoX from 'icons/device/NanoX' +import IconNanoX from 'icons/device/NanoXBanner' import { translate } from 'react-i18next' import { connect } from 'react-redux' import { push } from 'react-router-redux' diff --git a/src/components/EnsureDeviceApp.js b/src/components/EnsureDeviceApp.js index 623166a9..abe7c37c 100644 --- a/src/components/EnsureDeviceApp.js +++ b/src/components/EnsureDeviceApp.js @@ -98,8 +98,11 @@ class EnsureDeviceApp extends Component<{ id: 'device', title: ( - {'Connect and unlock your '} + {'Connect your'} {'Ledger device'} + {'to your computer and enter your'} + {'PIN code'} + {' on your device'} ), icon: usbIcon, diff --git a/src/components/GenuineCheck.js b/src/components/GenuineCheck.js index d3487591..00046d99 100644 --- a/src/components/GenuineCheck.js +++ b/src/components/GenuineCheck.js @@ -146,8 +146,11 @@ class GenuineCheck extends PureComponent { id: 'device', title: ( - {'Connect and unlock your '} + {'Connect your'} {'Ledger device'} + {'to your computer and enter your'} + {'PIN code'} + {'on your device'} ), icon: usbIcon, @@ -157,9 +160,9 @@ class GenuineCheck extends PureComponent { id: 'deviceInfo', title: ( - {'Navigate to the '} - {'dashboard'} - {' on your device'} + {'Go to'} + {'Home screen'} + {'on your device'} ), icon: homeIcon, @@ -169,9 +172,9 @@ class GenuineCheck extends PureComponent { id: 'isGenuine', title: ( - {'Allow '} - {'Ledger Manager'} - {' on your device'} + {'Confirm'} + {'Authentication'} + {'on your device'} ), icon: genuineCheckIcon, diff --git a/src/components/ManagerPage/FirmwareUpdate.js b/src/components/ManagerPage/FirmwareUpdate.js index 85af33fa..f9f9d4ee 100644 --- a/src/components/ManagerPage/FirmwareUpdate.js +++ b/src/components/ManagerPage/FirmwareUpdate.js @@ -18,6 +18,7 @@ import Box, { Card } from 'components/base/Box' import Text from 'components/base/Text' import NanoS from 'icons/device/NanoS' +import NanoX from 'icons/device/NanoX' import Blue from 'icons/device/Blue' import CheckFull from 'icons/CheckFull' @@ -26,6 +27,17 @@ import UpdateFirmwareButton from './UpdateFirmwareButton' export const getCleanVersion = (input: string): string => input.endsWith('-osu') ? input.replace('-osu', '') : input +const Icon = ({ type }: { type: string }) => { + switch (type) { + case 'blue': + return + case 'nanoX': + return + default: + return + } +} + export type ModalStatus = 'closed' | 'disclaimer' | 'install' | 'error' | 'success' type Props = { @@ -88,7 +100,7 @@ class FirmwareUpdate extends PureComponent { - {deviceSpecs.id === 'blue' ? : } + diff --git a/src/components/ManagerPage/ManagerGenuineCheck.js b/src/components/ManagerPage/ManagerGenuineCheck.js index fed46656..b8782b4c 100644 --- a/src/components/ManagerPage/ManagerGenuineCheck.js +++ b/src/components/ManagerPage/ManagerGenuineCheck.js @@ -28,7 +28,7 @@ class ManagerGenuineCheck extends PureComponent { connect your device {t('manager.device.title')} diff --git a/src/icons/device/NanoX.js b/src/icons/device/NanoX.js index f72d05a4..e40572f2 100644 --- a/src/icons/device/NanoX.js +++ b/src/icons/device/NanoX.js @@ -2,29 +2,15 @@ import React from 'react' -export default ({ size = 30, ...p }: { size: number }) => ( - - - - - - - - - - - - - - - - +const path = ( + +) + +export default ({ size, ...p }: { size: number }) => ( + + {path} ) diff --git a/src/icons/device/NanoXBanner.js b/src/icons/device/NanoXBanner.js new file mode 100644 index 00000000..f72d05a4 --- /dev/null +++ b/src/icons/device/NanoXBanner.js @@ -0,0 +1,30 @@ +// @flow + +import React from 'react' + +export default ({ size = 30, ...p }: { size: number }) => ( + + + + + + + + + + + + + + + + + +) diff --git a/src/icons/device/index.js b/src/icons/device/index.js index f5282739..acfd1b3d 100644 --- a/src/icons/device/index.js +++ b/src/icons/device/index.js @@ -1,3 +1,4 @@ export Blue from './Blue' export NanoS from './NanoS' export NanoX from './NanoX' +export NanoXBanner from './NanoXBanner' diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index d4c82529..3c23830e 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -145,10 +145,10 @@ "messageIfSkipped": "Your {{currencyName}} address has not been confirmed on your Ledger device. Please verify it for optimal security." }, "deviceConnect": { - "dashboard": "Navigate to the <1><0>{{managerAppName}} on your device", - "step1": "Connect and unlock your <1>Ledger device", + "dashboard": "Go to <1>Home screen on your device", + "step1": "Connect your <1>Ledger device to your computer and enter your <3>PIN code on your device", "step2": "Navigate to the <1><0>{{managerAppName}} app on your device", - "step3": "Allow <1><0>Ledger Manager on your device" + "step3": "Confirm <1>Authentication on your device" }, "emptyState": { "sidebar": { @@ -283,7 +283,7 @@ "subtitle": "Install or uninstall apps on your device", "device": { "title": "Connect your device", - "desc": "Follow the steps below to open the Manager", + "desc": "Please connect your Ledger device and follow the steps below to access to the manager", "cta": "Connect my device" } }, diff --git a/static/images/logos/connectDevice.png b/static/images/logos/connectDevice.png index 2ef15562ba6a5e1d034258b72eb2eec6c67f4daa..5a5121e3437f9309af2c0abece2da3f65013435d 100755 GIT binary patch literal 5932 zcmcgwRZJWJkX^LE;#z!L3KZ9(MV3;Ed$Ho~?z&iMu_8qaEbe7-iWiqf7bpu9D6(jA zTl{*z_j9@A?vhE~{LCctGLyVFpEcFr5fRW40000YB}IAdf2armUuzm(slm< zhL`p`IY7+>!!7_oy`>}%*7e6Y$PG$j7%~}Z53*&xO0ib*V^;|!fg7OY*tcky=m1N$U()+neETyU@SzS`P9PYHvCJsxCFt{V?twb~)c2ddO|Hm6-v6 z>Q|By6CT|qeLdwJL4MC^NQ>R%A!Bia;g3L3>Hg<;aWPO=5egt?qldLMDh*nX<&WkQ zx&299>L6ZCQ z2zlDSw!kP25KS2i_HFLI!O79O_4nBJ%?WAFth>3v?RH|g=pd_!DACJZ1q9X12A@;_ ztI|p=I=o<7@D5d&SXzZF%xfl0BLWS?*aB!}2`~xj>OfeEVA*FP)YbqFyqEoh5riNd zjA*1m5=Jp7pOhXb2%*HLw6p@_CPhHxoVkYq+N7GF5^(-!#RRf-K^MPVJ2wIkRl}kL zLb*gh%ke?jyR}0{YDljc=2n<>&1P_NyT@}s6J6|6Wn9utDes2V_%oFPCkd&zgWk!w z4)j**M$F@U#@nyAF}^D-CAag6Q|Y&P_wi-ao_d3MN0Vxa%(vuHMZ{Bo(vukz;faD3 z-EVoC;+xTf5e+29nPQjzxg?$p51+zy?ydiDbtx}JV*%;t=^MUu`=U6pqp8FE56=AI zbi~{{CCnNyA@@BQ`kvp6J-qruTOwY26uL0nHrv6KVcR034ntMB+2>BF2SR<`*Lq;I+jtp z&t~A*R!DO)M#ia*DB;1v)Kln%4;(`vCJY~#+?jwA^VVmw_B1l##L%pTa_VQgNzk9K zsf>cw^CU-f<8;dC03NKyu*cA~wh1VUP!B>!%&N)DG+F&mht+1qyC%XZv*3*&=IA3@ ztu)fPBgXqamRsFjL`nk!3a0zEajT`hyH(x>R`4HPli|^SEVWiS@_+uI0>qj%1jyUSac|o8fw_iIU58c_E z2xL#F^f9q6u(PDwkwwOl@M0~M4wrS{2V`Cek0NJYlH5LcjZbXPX zG0P(3DJZqZB=7K2Y&=r3NgSombO*Mc4(zTrZZOWPW!U-&%`cC+gjx;|>>rQx#e~si z_*Seh4n^!KQyx6IAUV1lo*g@fBYa3OH&|TXN}mjBGydPkLTp4mF5QsxD7&#ne^?#Rqqq*SVI zLQ)A9{n2HBDb6ez-7_n)T+RM3dagzdn{#o8P<)VXU0~b z@CnT6w8Zxn4dE)|4aMgZ#PDXCDKkDj(mUh%?y02k&4p?2$pGOi-gxHgwwKf^dl`&E zNfb--SDn{)=;AC9oRN%!k5R(A9Pw8w zTMbH^AIDD2965BWBNJKk^~&nq(EO8C&n3Ws$6teE8}9R0-$BIe#NQ6iV9A@6VR^Qh zv>?v@kZ#|3JIz;JRGd?t6W+Te;p0V6>j;`RCv{~ugR7gsBo8A(rTbw@QazpJFUvvm zod#EdfLxT(MG}|!YZ4{>2aEDXun==>WZDR0!T#r|0LQW{%tCF_7mdodXR3#gSB!*d z+=Q&bOfSG@4zRFrU-jEo-gw5jYO(24G9Bel0@oTYtjZ|Jpn z8(~Q2DKr(qYZD9yTt@?nBe`xi4+9l1?(>^I_!1RdOa9rynD%0ap)dcD4uardLK?-D~-UmHya)2H-KFos;$Q2r|8%kyVT{RN*? zUjoR@fyW6T{?~oTIElzF0`O2Vm8z39O{55pEHzU`--P`J`uby0bqG?}_ zA$b!sa#BQMGMue2cD7hZRkg(xD*cjeGE1R}EWgzg7_YZoV-)mD8X|WFF1N(hEHa7O zE~dBn-r>p&tSo|vRI4S5U{ZP_3f?E^c{u`Q8=VPyNH2sHCl`f3*YIbAZt6ejMkwedQ2Uvl zW=c}Nng@oqv9c6`#E0{6VNtdhQlbp2+Opfwuyv!vh8BuX?xmU+qm4iOb(n88O@e{E zM$#4^F9a4h118&AmOY@7QWqj)-o_izbCYBpzM1?^;-J-+6H>R#jlUkE!j^e0RH_Wx zWi$Dhai@a4K{{Byf${51aMO6)XU*~c-OX1MelQ5NmsN&-twEFT0)-|es3N}CmIe#h z<}x&%;Q_r#lWY^P+rK%yuov^9mU-3Ca zzU9AEGLGg@I;l`_Q>%Clwt?Iy%*qSfZrU=4!*tLwb-KZ#$L^AptGoYsh5)lqn6b20 zXQ;cy-A?L@ss>POZPbO~>@az*C=@PFZynDCay6`c*boQ0JriKQ#%@YxSE zWt&2|7(RY2@Bxn8xyM%~^^?6`7{Yw;ljvEKpbX5aFVAWrn@39`{K1wsCP#dvI!WJ z`50XzdG=>WK(vd?p_rc!gn3%@cs&VqHe0=QMQ7cbtAUq|4{OVn3yz^JZF)!2G9H`W z+5zMtnmL%?ZAMO;G~9O|aJd6@jI({e^gRh7rgtRa|L|HY;0~{|&~BxOLv~G)$dz&V zP~xuBe%D?f_v159sjbv)YRnSj1XBe+19p^`Gwqfz3mJofV79_YL zk9LS!WOC|(L>RxwnaV(c+FG>Y$Cx1dK{W!VS9H0vEgOCQW>$feH+<7!tuTSmy7?@P zMIa&OBvkA)A=LYJXXh<|=RA~Csw7o!Ie!L)o3u_L0{OpC&i_Sra{z3*+WS0^ z+w;Wte}|~9l_@t&-0v$67Cr|!Zb6b_5|H*y0&ILnT86y^gjt-WXamB0J&ay`6QO0Y zIMI>f(~eng#l=&%ZBuv+I+L1XFh(HKEx$ih#UZ&R@v#|h>9)6jMRL%FCBu5tj`R+| zYEH8}v)Rm_Z_WMGFQT9*<~wK^$`mIPqgKG~%-a?0dzV#|;Hct}t5n1s>x1K2^P9VtE3Nv z%|1H5P1SZ^yYV=SPA8>GO4vDzc=%#8>GybTz3{KS0id9OV2hS?g{Z;~tT*BNr|bER zczWpNOjyL#NxT3&u+kCZB?svm`~C>c?sY!HHOR0bU*cZ<6fAB)O5CAGiHrTF-kt3N zVAxD#h68k*;@gxgk2UNq6!l0s@u#XbTG+aawX?^6L^)Tjw+R+bPFBLaN>~N#O=>;ww_D{j2*W{$yd8`bOV-vc`Eu?T13xqjATIk9&_FqC|G ztN?G}O`%TC`BS>@+gbz1;f3n{bG<@rgOL-f!O$k6$G79bMWKm4QwD^QbBnjdBlg(u zg~c4CWS{QaNP11S z`b5iVl4sCFfAWc;h#`qYT$f+X?$wrrO)bI3P@}_lY0d8uv^_Ky(u%OyY4cZ4krTVO zQfIn*dIzNohNNn(h_Av7!h7k~)By&aHq6=lZ`MDBcBO6=JB(7j$9}>I6sXK|ye6%7 zG=EQ}GWm+t%xq?eZ}jJX4t1~t#}mxsq^xHfC%0^)z97@7A-cJiQwJVf;@RNhskadd z+wXS9ZoRs&rjp1SilY5qt#B?$kTg(Nsr5ni9X*=~+K#{nfbwjO-Ty%r;`{bpkcY#a z>B#zF;nYft8#IcfGXI_NFFz)}6}NJrMfW{mDzA}$06?G2b%Vnvv`YG%^MPg4euN6*Cs{w?z(DXifQ(i=fS8Ido!x??0GR{Pe>a5S%;$n%?l zJaxw{2la))4EE*x)ukm4bvm}MOB|fmvPk*^foE?pnWSWQ zG(F)7J7x%-`D;S*8Efr!rreubHQh_V<5bGQ4)jV5h|> zWV9{(Yfdmd7$K4KIb*J4$|<@!IK0w8el;WngVj}=RY-P4L3LI@u&^U720Dn;K^jp5 z*wr>fVse5Ey8Ygkp+T~B0yd5xqJIVwq>tCu7T^rC$qL+5!S-hmZV3Cm6gyimIpf>F zOj$lU>b3DFyN44m&#B?46#8iyznU8E3S(>B@~5hcGdF6{(_8G-txi+~aS5(D581DF z_3IqJRi%wbv$s7y+&b{qVS;RK_T|b1pp#aTaVx|P3`VtL_dPv56BU-iTsthyJgWQ@ zd5&slMHGE`D{>{m`|{^zA+NM-Mz8}#y0E{%QKtr3%{KE z_dDDadBBG$ZppOym?0&fMX1)zXobvk(vqrL)vY|KX}JR1X2+}NAJ>AFRbKo%xzaR7 zRaF&Y$x#|}sgekN(_BwHE$rVZbLC-gN+P+3>)Y%{Y; z1S4gnCE>v62tACl(o$n@lIJ(yYCHYGw$o85TXx8PMv4^e#~2?}mZVVME)W}Wn3^b* zo75&9IMC*ULZIOFT93#&s|$RcAE#}19KTx*(`V~7Oxs0G^Vge(pcF zUfJ@hd>D5+-9#!V{o?YnzDjo1>w=SON}M+^2v+Mf&siKv1N^~V2@^#Ug>b4tZEe9B zd}gMGc`)NvaxF^zPTn--Ij4BLdw(+#nu*5ON84VS2MN$d4M_iFz)aBkH zRg6=?kdWwa6=b9|-H{J7(7iS1E(a#kndr#B_9(w4_^PU^tEC!FEQ9}v6H?kR=Qp=h zQeLjz$7X%_*{;6)Q#r9-eWFTVgLNW_nwpF`A$|{mJivqy2z)Eg!+YHRBz!gI#ft)r z8#0?;4^C~~*X`gQ`q}KV-cCUmfQ06cgr@pbZMsbR=SxD|!t5tZxr&|Dn(~8QpK>Ni z!tL>tH@)rdT2Oy~xe*(FKR$=CBYs*<%QTCIG#oTkWV}H(K>5G^SS_Lr4m5x862YE` ztt;+~!(-Us&tc`d$90*=wSO%xm5a?sL7Y~Y<%w9wBF5WF1qI^r1&bAlnnIuXBmXt& zyN*;`vOgYa(xU)CNPss4mJfo_WZ1p0@sN=5s?aYegn1+#|IFy|vUb!a6%?lyNTe6O zQmKV7?Lin)*GBa1c~d|>uPXcbA~CN|!-166aXTI3`BsXAWr7uO*O|dNefvxc;5na$ z#XkdghiG;aw2`j>DYvSE?C#o<2J4}U{*Ql?E8g%Fy+p>77YVRO8StKC+{Te;Eg14D8IUDo(KE#@^g;MIq$yAuV8T;Fw<0xQFx zJr+HD|NVx8v8(%>#zA>)klOrMXZfi00LxGc2?z!eqm8EVkC@LMW&|0F5LckuJ|BUM zClrUIqD6ZB0LlCZn;Fmz`A!aJc$JL>0L5qmUZBW5(xzUx=HZ*lMHfsJX1u2sb&V){ zM+4;f(M5XKnT4Cok*#GjA5%d&aLHMz#Fco#ndjRlJKJu9TyM9}VB|{!-G$=&5&NuE zTLO{sENKEzUfNjRu$02euOz-x40c*OcpG+XzAgUkU_eAc1V#eJDP`?oS1Pv;a%~a=d7`@3eD3xdqaOkcy-aDy`>Ro4N2?fn5mSXz*G{>67ixv->pg4a z1IRc5;1a@=#=i!)3xf1(k9gyvoOZ5VHe*X$sQ(L%5+CZon^;er)s3&g8h5C>s&?eKCG>vpaXegy5nM^EI!%PD~ORT|@QR&|mJ?$P^N; zs+!^$h&Y1DA|XRO4Y)sIK1UTO#sY{#TalY?fA@w{w}E5Wxq0Jcx(nJW=75f~(n z4$4xV*hejW_D;lU{{EvM*1hlSgCMZr-A~T%Qb$1 zTIDe21ptJnfY25r_V%+{v+w~nr9pL3LCGy4CsTWouCkCgbV~{~797?AoPVmx|HAI* zzpg(%TK;WO!(4Fzxz2lWLwaMYTQ?wCDgB7K9mo7(SvCd-1 z6g^UxCj_LC@MC7&z{=0XRaqp^S!hF;=#b-m?URnVX9 zdYNyOuc1r>Ptc2tjdoHL+`Gs$ms-*>^(oq4QO@1yVF;`%Kv%h=hhmm({N#wM0NB~DT>n{?}|`*9sQjt3W|1b4o!cT&}7x`o^$A>xXWVCR44s{6E%SC~ zxL#&Qu@vm1$VlILT7oMt?l&0>78`#bg)um5g4-MWEyGfnqca}vU5FAc$+9nUj|~(L zm+QTY2kxluA5GQ#UB7PC`EsQR%#YB*DRA@b9tJ!Q$B?h{3ETLbnnDc?2(qHtv2Gtq zeQ_Gv`Ao=s8>0KLAfQQ2gna4mF&@-Iz)qcX$*>l>5xSf;WcT)*OqK$Hlep+rnNQal zoaP*o)pX3M8P`!cQ`x_cMEs12cJWm+$qY&_V+<%6`$&4~(sc2>0e~7`-F%?8ZvB^I z!`p?@N)Zysu{Jo_z&lnWipjKUmAjob>uP>4AzAw3@Vt$$j1{h8$nklO41KUNBSE@Q zhm!A3Npfss@%YdS`&Q)TGS_|9z$h_FZ8{>e9dtZe?fRI&veZKC#YRFx*LC@pcIX#; z4BhVhY?tb`jhBRpO&rx=Ri_2y`er&-X^U&)Tf~Tz!H?c{+rK~i7q_yyb3;!@H7a=l ztsc~VqU@h^k_J1XHgJ6)iuSY%Xfnm2{UaC)}`Vh)Bb0fy!=c~^}emuxhTp-}?(CORDtfiS?_aj^%4LN{=`L$oSp4!?( ziUd>1%Fnkb+|Ad^J)mayx3?`rhVY){O(wP>67PkK<9s=zQ+CRu*6H%E4GIaqd&mK< zEdKr?tChw{e)ps(ntu4*{Z84p1JsCLacpStB^dVHq3R19F35|G}sgGJ7bowhI>N^sSZv3iQ+Ct`nWI2Xb)M%;U3Q2`V?seF}58zD@gU6-YfN_}q1^Wiw&9tqfQH6%V94mQFoJo~! zDIKFq2=$_onLM{%2o_X=M|%hznx8fx(ojP0rrO)|>u%XY-BY%LjA?q7P_mY$Sakkl zv1m3hB=tf3)zbl`6qm&+w>VVNDr}T|xnoH^@ImY&O zd~^AN6-0Aai8WW{L)^;P_KUJE}~Dj5tm~jaT9v znFD8pjm4x%bRMzh?ZdPA*-O2*cEUXGZ1FQ}{V8%SNSn&~PuNQ>$~hEo!`NUp%Y`-5 z{p3U8%Jz+y;g}_zbwiTowbK>wMNcLT*k{>c&biRLANH}oD>?e(%D2NalN_kz6uPHI zGUkMQs}H{DQalm1%KSPcOwO^@eq`6nTdP^D(16Aq3TQ0jDh<_n*Pd+#iIUj3C?Oi2={}LWHmD zP?&G()tv}m+RrbV5GXrilWI8*NhM>jY1N7;9I#1M!1Lb;Zs{oY09`&)K&KaQLhLmt_r?V9w&BtSXZk|?TTx@}ArPblF zEDP`t!UuJSzG0N9K(FVLOzMYg|5(6w-@OW^iK`9t%a@!T=s@Ket}*Nf^~L*76qbv* z{<-w&xK{d=oiw3jUwH*}UqaRe#T)_!92Pf0tXv05G%7P|>KRhmqlHvW?mc8=i zDY_fv!JN?&FRE`6=_|Uh@Z`~u?;7*s>L0|^bAf6b;NfjMZ?m2FUQS}oA@25UxTe3k zBjr`H0lT??CQdbPL>5Lc$kOq5^MYDcP*NAx)l_F8JpnJl*n*6qK*};Pnpl!kE z_E~S=*`cl`|F1iF>eDj+2rb?P^_|c;o&H)N`NVB=(ti1(rcK+R8Pv8eEzF#@iBR$n z_Y_lYyS{d956>qmV<|DZk$>km^gq=g!#eX5Tk@tRo5={@v~TbqIh%m)oc1WRIJIM> z=`!o}LBtGSbe2i}*19-qoAy- z`q|AZW~hmDNtGNiD!W^!E8(KeeSS$>5jr_HORRox_4~MYSlAMa4a^^457@ zZNvY#{>7U(03iV7&loV=n@S?Pcn^WC{)#@c@nWWd zf!bq4Y;hbH9SHvW8;GZxnS$^6A9V5u69x2!<_c0+?~g=VJ6O{Vjuhew;^lApPVks= zHH1Yz*R26WvAn(Zp2YaSbL8+XPe#hIHnuNCc9nzK(_`YjR2hr)jLU3?#agBD1MBmx zhf`iigF#HskZx!Mko$iqDHUvJXqeyuxx7?^7Lb^ww+VQsyl3Mo7jjQwO_pRCM8IP3 z-)n?`w3)b{{)2(wzpQ|c`#mO_&}*`@j~a5B;bzp3lKh8y)G)he*;tsfzTW($WM6Vx z2#AE>0s+bzu7)M$0+&>9(o`MsG7P3(H~|HrF71(}LWFJjXsPeKM$;$gp5K!uM^)w5TZ+Em`Lu2c-OlqxC>4@qTN}Fo(8G{z(Dp%Wx{f z@zDE5LmBtqDc=c}35A(+7&Cfu86B>33ms$x2%bTn8Ct-~PpY;0xx=5zUVC^dyZtF5 zj<%2FnI@kGO69lrjy2^!E22DcI?z5e(-D6N!Un~}0S|nN2C5k5R9-StO zE`NL-Ss>1tEv>0nkewIC)6D5qBjMZT+@`vuBsAQ1bmTR?)#4#nB1yjULqXF6OPRV` z;tA%o*7Xkc5gMi(i#Y=#$T8SqgX{(?8fG6oj!36-``I7)A0?wn4e%cr9Y(Z8q&+namwxL^b&E3V-kP^v4^_S=*~dHj+1US4 zM9c6JeKF4)?S^|xx}kVK-@EFeaa*@0!92+~w(qH_G(Xc^=vIr8lGQoikb_`3f7Gr- zd69n0oa)frPJ6mYM{OwU>fp1Bk>t7?ng*jBm{QE$FRUvotF!rUFrO z1D2wzr5Nd3x}RuU%IdWEq>l3v9DU@pHIaJsOK&|H2Hq1F?wytdvU5_uXZm6%S&lp% zN;@rkaW07{0Vx5Dt-3?n_hp`Qdl!F;65?}%TEF8eXIR%tSh7BpFkLVPG2WV&CvhFo z-RF-ID~P|E`YK<>`zqOp`CD1PA}0FD)E0yFeh|C+W6{uY+nI*8rpWdi-{#_A_!}w& z!jQ>oDyk$@)zQ=%7?o9K^7bM=E&ldy7&u$XR(@5WDboJNqKga-fDST#Ih$EqAxM9z zfXAxPe#T+8tq?|$8S^Er#ag5A#TmNqnXa}nS%MCK$d(v-5R<}dPPf;kqQSCdB5TnD zF2)=+AJcwdLcd8>Xt6xN$~3lSuF59k25OOlf=9|q<+W#W@97Jv;apaDy3_Q9FVA2> zWglMD&`SXvk66ykn6+-dQ^nHzKn!%te-D!#vAuKA^{lbu3A`H`ZG`}`iT@6}S7(aX z-m-NHrD$nU%@4a1|9xKzA9G&x9jf(CNxeq zmX1Obn$8@X1P^BN_+zb-*oQ@9^eS^F6}iqTg485zePdc^%P{fADUXa9YkYpDyqQIr zk^<>df{~cS#d+3}Zd5U4yGM%1D>dvMjTJP@Pw8V6a}vFPbf-9=k*tyzll?m|9wKxv z50{gZeD161tG8+m7`-%hck8VLQhmksXB#5l*);6k&;QjrP97s67(l*nkS$##pEl*C5K%T5H>8Rz%r>@2=p^gbB zQF8@TbLbD01Nf!xCf5ouAc0ABx{-Cb0Rm08-2NV)15Z6xht$ zJM3~XmWlc!`HdA<=rM0hCDCB{R#OOHXTodAA)qpi2*+?>pQ83}BGvF17r7=_F1AQ} z3uD)ag!9lEipYB@0LEEl;U7@IMY4+2_ZXyY)mS=U+}#@?X;4oj5O2~_E|0`;CVCMr z4^kS%r4--@{c<~S(y0E}CU&*Mj3X_Gh+R`WGT&(hHAOKJZm1sR=MUndt$P>U_De34 zc~|p5(}d|WlknldiyLH(#pznYfCFoOvQoe@oX2KI>sJTp3GCt7oPC^d~B0=Os%P@*~?wq%m(s+LE&ibVl*O< z->>SfbE6X$MszBoJgDo@QV=7c5kdGx{~0J_c0tKNlu;ln(fIMwTq>^Dq9E#>dyK5) zup>VX@Pv}^<#)WPTi|@9QDLJ==SfB3BV`t? zAHQ5i4q1Ga1y0Fs^n%JbW>NhNZ@*Vj5O;OAH}9CN8=k!I^N{B#t}Ck_?If*(^kzqf zSoPe-KIVeOVl0h6l9tCMBYWtQRb_xXBGjcVT)9iBf_)|Z7aVjxSZI?Cys(M%0I!iPa?ZRF5|+x{lS=|%nnl~ z?9N-b__R7YCE#eaWhzB2*K(-F-1;IXIw{sRd!bbBiY!l8noE2{ zvDJgxMYmpArOketKi>J%Ay8Hr-|3&XWcjLf5$73~>FRT>A7k-PCrF>bVu+J5o+@yzy*GBhru6%VKnY37Qr#j}#bD>8cqiW%61nAtT0yTZ_nLvCfh zP5x2`HfUCOGmXH*(#Sx>{gC>$7$7K0Lx|Pdpc! zAD%P9ifGdEC<2CdGvqoSdTA|>NsU-%9tEz5TW)S0)JP@L#O4z+M+VXi6Qo@{#4lTI zT;sAlr;BOQgnDxADI&BgBF@jRJRB-9rtcG_tkLi?AaUsy5h{-XJe;TKrc$6qM5DxV zhXMAhMb~sNyizrR#ZVZYpL+Rz^9xa8+YSZ=J8v26sSa3-DAywwEVuH^*$xYMZ390l z1Vrd-CN%5J(ALfKwchaknO8;-4lp=-WtJR`mws_csY4b^=7Z>1+hspVG09A)M7N?3 zhW^C_F5qHm8st!1IFq18Lm@i2deHR=0LzEAg`*vBJN>OHPKwocib@{ehRi(Mi<1El z=iMjfm$_1)Y+!?S#T~=(S+yAWwwFpXGf@?auHMgk=vTZ}S3oZX&nmzN*g1a}sh_jl z`Ui4&wNqGec$(qPP^4b)=`GA0Dt0+s{3ZFfe&q;vs?@~&rLf3Hjob@~hkL4)gU#aE z$|m_ly)#BZj3`#8sV9kfj|LHWmo?1El|Ez&^*wDC4xG(=I%*FcoC$oVYO2+`&Ur+` zfa=q-m<7>;#EHP%xF%dxB*x04NFBoL$Pj#mF+La^nfa}bsjF3M&;a~}G!ciglKi$W z#6o$SiPp#6vqf=9q%Xt;)Sl|L>|0^OvOZBFSXj%FYI;}aWVhEB47oVQh4T&+bDZRP z$&o4vg-PNwfuMJ1u(Z<3964IQw^o=ZIuyLL_t;||w{A{TM>e@reP7&Xxj>jY`*kJn z3+K|yL(9RpbrX&6U*Zy;u04E>_vEy!bTZ~@b#E$mX`Rn(j#iIC5DY@k1cPrtZFf6- zxaMk6#iNMNv>(gO+}!+gLB4Iilc(K6MTXV!M|EnJRJ<8y0E%ZTEUEIk=<}Bt`2CdB z`;mOEgxOzLbw~37Un*{v6D17Fz%5_C0H>;7 z50K$mVjx6S%Kj!{CHpr&*>IDaUx7v*geM4ap6s)FsLubm;%|`!s$7tETYn^M`PYB4 z1Z(yE_d3J#Ocky(EqFwu=)Y3SyVk#jLjsTjp#rRg!%2fO$pHU{OUjjvIgS;?ec-`S zzm|F-uB+v|3d(9Sh}t};k4T}sS4%y-|4}Q9cqtysDn)rhVhruRrcA4@13u1VS_EYQ z?-2z{1`iC*KpUR?j{}O~2cDfTO*;5JV#Xa_99;CLW5S|d`r476BH$2Wl!~YN<#df`jpD0}R zbyQ5SQW^CP@b#YH9(=v&m*Ad2|4e-nyhji>Z=Iyc|09kB@UM4>b*A}s45*=J;ZNR? z741;vl5*%+PAuYKo5r-i=aIdcVTv8f2-ad;FB-@C8$OCO$hh$xYJ zmgWB^+rD>=39f+M9{1$bNObHM-)nF`NqX)C`x(ECVdY`<2j3#XA;Wh8izMhjvXCx- zox44O=4OstA?j6Qyd++hm+uX$(#9fOMZ2=T^nbdsKjK~EB#Ggfw63dDd$bP1F8^ZF`a09k}?I|r|aK>sEu8{Khd z@IJh6d7N*x>MP+V-{Ag<6!3vwwccDWK@`<0Qz2NigyhAuH^|cmj2pa%2U(nG3rG?2 z{-YI=Csj#*msapYp$@A=3e*8yu@{V#d~g-nEkm!%_GUO-Y8QPkmWSuoFEqZsM z>=ki51wK@4g9vPz2MC}EdguGfa&kGgq0VMGDFlc7ZH9<(2v;2DS*k2J$@^fXKAf$z zWKY%3F8=4f_GIw(#yM0?FEe`kkIOR_yCx7Cr2Q;u&>GP3$L}v%_mZ@i0M}EPCViF! z0Q<-Pf?(3_@8I3F?{BX-2XqdELY`MZF8ay)-&$g#K0j6oIw*T8x)CG>5*lM_*U=gA zl{MD_uKPlC3u8Lq^1o0*@Rt5=m#;|=)~fDj2j7pX%1wi55T2Wlc0nW25Z&3`^s5si z^S2%$@tNS}2DZ1xusRtE0G$EUs@O6#Yxeeo_=gI*_~X_34#*Cvtzc?ZDYC5Y+pfNJ skCe+a*r%~$X}5#Lx`R~)>L Date: Wed, 20 Feb 2019 15:03:56 +0100 Subject: [PATCH 2/2] fix wording --- src/components/GenuineCheck.js | 13 +++++-------- static/i18n/en/app.json | 8 ++++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/GenuineCheck.js b/src/components/GenuineCheck.js index 00046d99..8f25ec41 100644 --- a/src/components/GenuineCheck.js +++ b/src/components/GenuineCheck.js @@ -146,11 +146,8 @@ class GenuineCheck extends PureComponent { id: 'device', title: ( - {'Connect your'} + {'Connect and unlock your'} {'Ledger device'} - {'to your computer and enter your'} - {'PIN code'} - {'on your device'} ), icon: usbIcon, @@ -160,8 +157,8 @@ class GenuineCheck extends PureComponent { id: 'deviceInfo', title: ( - {'Go to'} - {'Home screen'} + {'Navigate to the'} + {'Dashboard'} {'on your device'} ), @@ -172,8 +169,8 @@ class GenuineCheck extends PureComponent { id: 'isGenuine', title: ( - {'Confirm'} - {'Authentication'} + {'Allow'} + {'Ledger Manager'} {'on your device'} ), diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index 3c23830e..94e7b5ab 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -145,10 +145,10 @@ "messageIfSkipped": "Your {{currencyName}} address has not been confirmed on your Ledger device. Please verify it for optimal security." }, "deviceConnect": { - "dashboard": "Go to <1>Home screen on your device", - "step1": "Connect your <1>Ledger device to your computer and enter your <3>PIN code on your device", + "dashboard": "Navigate to the <1>Dashboard on your device", + "step1": "Connect and unlock your <1>Ledger device", "step2": "Navigate to the <1><0>{{managerAppName}} app on your device", - "step3": "Confirm <1>Authentication on your device" + "step3": "Allow <1>Ledger Manager on your device" }, "emptyState": { "sidebar": { @@ -283,7 +283,7 @@ "subtitle": "Install or uninstall apps on your device", "device": { "title": "Connect your device", - "desc": "Please connect your Ledger device and follow the steps below to access to the manager", + "desc": "Follow the steps below to open the Manager", "cta": "Connect my device" } },