Improve clarity of second passphrase registration texts - Closes #1026

i18n/locales/de/common.json

@@ -2,6 +2,7 @@
   " Make sure that you are using the latest version of Lisk Nano.": "Stelle sicher, dass du die neuste Version von Lisk Nano benutzt.",
   "Vote_noun": "Abstimmung",
   "Vote_verb": "Abstimmen",
+  " a fee of {{fee}} LSK.": " eine Gebühr von {{fee}} LSK.",
   "About": "Über",
   "Account saved": "Konto gespeichert",
   "Account was successfully forgotten.": "Das Konto wurde erfolgreich vergessen.",
@@ -96,6 +97,8 @@
   "Node address": "Node-Adresse",
   "Nonce": "Nonce",
   "Note: After registration completes,": "Hinweis: Nachdem die Registrierung abgeschlossen ist,",
+  "Note: After the registration is complete, your passphrase will be required for logging in to your account.": "Hinweis: Nachdem die Registrierung abgeschlossen ist, brauchst du deine Passphrase, um dich einzuloggen.",
+  "Note: After the registration is complete, your second passphrase will be required for all outgoing transactions from this account.": "Hinweis: Nachdem die Registrierung abgeschlossen ist, brauchst du deine zweite Passphrase, um alle ausgehenden Transaktionen durchführen zu können.",
   "Note: Digital Signatures and signed messages are not encrypted!": "Beachte: Digitale Signaturen und signierte Nachrichten sind nicht verschlüsselt!",
   "Ok": "Ok",
   "Original Message": "Originale Nachricht",
@@ -112,6 +115,7 @@
   "Peer": "Peer",
   "Please click Next, then move around your mouse randomly to generate a random passphrase.": "Bitte klicke auf \"Weiter\" und bewege dann deine Maus willkürlich über den Bildschirm, um eine zufällige Passphrase zu erzeugen.",
   "Please keep it safe!": "Bitte sicher aufbewahren!",
+  "Please keep it in a safe place.": "Bitte bewahre deine Passphrase an einem sicheren Ort auf.",
   "Press #{key} to copy": "Zum Kopieren #{key} drücken",
   "Processing delegate names: ": "Verarbeite Delegierte Namen:",
   "Proxy Authentication": "Proxy Authentifizierung",
@@ -127,6 +131,7 @@
   "Register Second Passphrase": "Zweite Passphrase registrieren",
   "Register as delegate": "Als Delegierter registrieren",
   "Register second passphrase": "Eine zweite Passphrase registrieren",
+  "Registering a second passphrase requires ": "Die Registrierung einer zweiten Passphrase kostet ",
   "Reload": "Neu laden",
   "Remove vote from": "Stimme entfernen",
   "Repeat the transaction": "Transaktion wiederholen",

i18n/locales/en/common.json

@@ -1,5 +1,6 @@
 {
   " Make sure that you are using the latest version of Lisk Nano.": " Make sure that you are using the latest version of Lisk Nano.",
+  " a fee of {{fee}} LSK.": " a fee of {{fee}} LSK.",
   "About": "About",
   "Account saved": "Account saved",
   "Account was successfully forgotten.": "Account was successfully forgotten.",
@@ -71,7 +72,6 @@
   "Lisk Nano": "Lisk Nano",
   "Lisk Website": "Lisk Website",
   "Login": "Login",
-  "Losing access to this passphrase will mean no funds can be sent from this account.": "Losing access to this passphrase will mean no funds can be sent from this account.",
   "Mainnet": "Mainnet",
   "Maximum of {{n}} votes exceeded.": "Maximum of {{n}} votes exceeded.",
   "Maximum of {{n}} votes in one transaction exceeded.": "Maximum of {{n}} votes in one transaction exceeded.",
@@ -92,7 +92,8 @@
   "No matches": "No matches",
   "Node address": "Node address",
   "Nonce": "Nonce",
-  "Note: After registration completes,": "Note: After registration completes,",
+  "Note: After the registration is complete, your passphrase will be required for logging in to your account.": "Note: After the registration is complete, your passphrase will be required for logging in to your account.",
+  "Note: After the registration is complete, your second passphrase will be required for all outgoing transactions from this account.": "Note: After the registration is complete, your second passphrase will be required for all outgoing transactions from this account.",
   "Note: Digital Signatures and signed messages are not encrypted!": "Note: Digital Signatures and signed messages are not encrypted!",
   "Ok": "Ok",
   "Original Message": "Original Message",
@@ -108,7 +109,7 @@
   "Paste": "Paste",
   "Peer": "Peer",
   "Please click Next, then move around your mouse randomly to generate a random passphrase.": "Please click Next, then move around your mouse randomly to generate a random passphrase.",
-  "Please keep it safe!": "Please keep it safe!",
+  "Please keep it in a safe place.": "Please keep it in a safe place.",
   "Press #{key} to copy": "Press #{key} to copy",
   "Processing delegate names: ": "Processing delegate names: ",
   "Proxy Authentication": "Proxy Authentication",
@@ -123,6 +124,7 @@
   "Register Second Passphrase": "Register Second Passphrase",
   "Register as delegate": "Register as delegate",
   "Register second passphrase": "Register second passphrase",
+  "Registering a second passphrase requires ": "Registering a second passphrase requires ",
   "Reload": "Reload",
   "Remove vote from": "Remove vote from",
   "Repeat the transaction": "Repeat the transaction",
@@ -164,7 +166,6 @@
   "There is a new version ({{version}}) available, do you want to update now?": "There is a new version ({{version}}) available, do you want to update now?",
   "This account has not been initialized. It is recommended that you initialize your account by sending an outgoing transaction.": "This account has not been initialized. It is recommended that you initialize your account by sending an outgoing transaction.",
   "This account is protected by a second passphrase": "This account is protected by a second passphrase",
-  "This passphrase is not recoverable and if you lose it, you will lose access to your account forever.": "This passphrase is not recoverable and if you lose it, you will lose access to your account forever.",
   "This will save public key of your account on this device, so next time it will launch without the need to log in. However, you will be prompted to enter the passphrase once you want to do any transaction.": "This will save public key of your account on this device, so next time it will launch without the need to log in. However, you will be prompted to enter the passphrase once you want to do any transaction.",
   "Time": "Time",
   "Timestamp": "Timestamp",
@@ -221,8 +222,6 @@
   "my votes": "my votes",
   "send": "send",
   "set second passphrase": "set second passphrase",
-  "your passphrase will be required for logging in to your account.": "your passphrase will be required for logging in to your account.",
-  "your second passphrase will be required for all transactions sent from this account": "your second passphrase will be required for all transactions sent from this account",
   "{{count}} delegate names were successfully resolved for unvoting.": "{{count}} delegate name successfully resolved to remove vote from.",
   "{{count}} delegate names were successfully resolved for unvoting._plural": "{{count}} delegate names were successfully resolved for unvoting.",
   "{{count}} delegate names were successfully resolved for voting.": "{{count}} delegate name successfully resolved to add vote to.",

src/components/passphrase/passphrase.js

@@ -28,12 +28,11 @@ class Passphrase extends React.Component {
 
     // Step 1: Information/introduction
     templates.info = <InfoParagraph className={styles.noHr}>
+      {this.props.feeNote}
       {this.props.t('Please click Next, then move around your mouse randomly to generate a random passphrase.')}
       <br />
       <br />
-      {this.props.t('Note: After registration completes,')} { this.props.useCaseNote }
-      <br />
-      { this.props.securityNote } {this.props.t('Please keep it safe!')}
+      {this.props.useCaseNote} {this.props.t('Please keep it in a safe place.')}
     </InfoParagraph>;
 
     // step 2: Generator, binds mouse events

src/components/pricedButton/pricedButton.css

@@ -1,7 +1,8 @@
 .fee {
-  font-size: 12px;
-  line-height: 14px;
-  color: grey;
+  font-size: 16px;
+  line-height: 16px;
+  color: black;
+  font-weight: bold;
   text-align: right;
   margin: 0 16px;
   transition: all 300ms cubic-bezier(0.55, 0, 0.55, 0.2);

src/components/register/register.js

@@ -34,8 +34,7 @@ const Register = ({
       keepModal={false}
       closeDialog={closeDialog}
       confirmButton={'Login'}
-      useCaseNote={t('your passphrase will be required for logging in to your account.')}
-      securityNote={t('This passphrase is not recoverable and if you lose it, you will lose access to your account forever.')}/>
+      useCaseNote={t('Note: After the registration is complete, your passphrase will be required for logging in to your account.')} />
   );
 };
 

src/components/register/register.test.js

@@ -49,8 +49,7 @@ describe('Register', () => {
 
   it('should mount Register with appropriate properties', () => {
     const props = wrapper.find('Passphrase').props();
-    expect(props.useCaseNote).to.be.equal('your passphrase will be required for logging in to your account.');
-    expect(props.securityNote).to.be.equal('This passphrase is not recoverable and if you lose it, you will lose access to your account forever.');
+    expect(props.useCaseNote).to.be.equal('Note: After the registration is complete, your passphrase will be required for logging in to your account.');
     expect(props.confirmButton).to.be.equal('Login');
     expect(props.keepModal).to.be.equal(false);
     expect(typeof props.onPassGenerated).to.be.equal('function');

src/components/secondPassphrase/secondPassphrase.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { fromRawLsk } from '../../utils/lsk';
 import Passphrase from '../passphrase';
 import Fees from '../../constants/fees';
 import Authenticate from '../authenticate';
@@ -22,8 +23,16 @@ const SecondPassphrase = ({
         fee={Fees.setSecondPassphrase}
         closeDialog={closeDialog}
         confirmButton={t('Register')}
-        useCaseNote={t('your second passphrase will be required for all transactions sent from this account')}
-        securityNote={t('Losing access to this passphrase will mean no funds can be sent from this account.')}/>
+        feeNote={
+          <div>
+            {t('Registering a second passphrase requires ')}
+            <b style={{ color: 'black' }}>
+              {t(' a fee of {{fee}} LSK.', { fee: fromRawLsk(Fees.setSecondPassphrase) })}
+            </b>
+            <br /><br />
+          </div>
+        }
+        useCaseNote={t('Note: After the registration is complete, your second passphrase will be required for all outgoing transactions from this account.')} />
       :
       <Authenticate nextAction={t('set second passphrase')} />);
 };

src/components/secondPassphrase/secondPassphrase.test.js

@@ -45,8 +45,7 @@ describe('SecondPassphrase', () => {
 
     it('should mount SecondPassphrase with appropriate properties', () => {
       const props = wrapper.find('Passphrase').props();
-      expect(props.securityNote).to.be.equal('Losing access to this passphrase will mean no funds can be sent from this account.');
-      expect(props.useCaseNote).to.be.equal('your second passphrase will be required for all transactions sent from this account');
+      expect(props.useCaseNote).to.be.equal('Note: After the registration is complete, your second passphrase will be required for all outgoing transactions from this account.');
       expect(props.confirmButton).to.be.equal('Register');
       expect(props.fee).to.be.equal(Fees.setSecondPassphrase);
       expect(props.keepModal).to.be.equal(true);