Merge pull request #2236 from LiskHQ/2230-review-and-correct-all-the-…

…text-after-the-resdesign Review and correct all the text after the redesign - Closes #2230
LiskHQ · Jul 15, 2019 · 599f569 · 599f569
2 parents ab70902 + 17de94e
commit 599f569
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 32 deletions.
diff --git a/i18n/locales/en/common.json b/i18n/locales/en/common.json
@@ -10,6 +10,7 @@
   "2nd passphrase registered": "2nd passphrase registered",
   "64 bytes left": "64 bytes left",
   "A great way to start is to top up your account with some {{value}} tokens.": "A great way to start is to top up your account with some {{value}} tokens.",
+  "A passphrase is a combination of a username and password. You saved your passphrase when registering your Lisk account.": "A passphrase is a combination of a username and password. You saved your passphrase when registering your Lisk account.",
   "About": "About",
   "Academy": "Academy",
   "Access your account by scanning the QR code below with the Lisk Mobile App:": "Access your account by scanning the QR code below with the Lisk Mobile App:",
@@ -114,8 +115,8 @@
   "Copy to clipboard": "Copy to clipboard",
   "Create First Transaction": "Create First Transaction",
   "Create account": "Create account",
-  "Create an Account": "Create an Account",
-  "Create an Account or Sign in to manage your LSK Tokens, become a Delegate or vote for another Delegates.": "Create an Account or Sign in to manage your LSK Tokens, become a Delegate or vote for another Delegates.",
+  "Create an account": "Create an account",
+  "Create an account or sign in to manage your LSK, vote for who secures the network or become a delegate.": "Create an account or sign in to manage your LSK, vote for who secures the network or become a delegate.",
   "Currency": "Currency",
   "Current version is up-to-date.": "Current version is up-to-date.",
   "Custom Node": "Custom Node",
@@ -172,7 +173,7 @@
   "Every transaction needs to be confirmed and forged into Lisks blockchain network. \n                  Such operations require hardware resources and because of that there is a small fee for processing those.": "Every transaction needs to be confirmed and forged into Lisks blockchain network. \n                  Such operations require hardware resources and because of that there is a small fee for processing those.",
   "Expand your knowledge": "Expand your knowledge",
   "Explain Blockchain Like I'm 5": "Explain Blockchain Like I'm 5",
-  "Explore as a Guest": "Explore as a Guest",
+  "Explore as a guest": "Explore as a guest",
   "Failed to connect to node": "Failed to connect to node",
   "Failed to connect: Node {{address}} is not active": "Failed to connect: Node {{address}} is not active",
   "Fee": "Fee",
@@ -184,7 +185,7 @@
   "Filter by name or address...": "Filter by name or address...",
   "Filter by name...": "Filter by name...",
   "Filtered results: {{results}}": "Filtered results: {{results}}",
-  "For longer passphrases, simply paste it in the first input field.": "For longer passphrases, simply paste it in the first input field.",
+  "For longer passphrases, simply paste them in the first input field.": "For longer passphrases, simply paste them in the first input field.",
   "Forged": "Forged",
   "Forged LSK": "Forged LSK",
   "Found several devices, choose the one you’d like to access": "Found several devices, choose the one you’d like to access",
@@ -206,14 +207,15 @@
   "Help": "Help",
   "Help Center": "Help Center",
   "Help improve Lisk Hub by allowing Lisk to gather anonymous usage data used for analytical purposes.": "Help improve Lisk Hub by allowing Lisk to gather anonymous usage data used for analytical purposes.",
-  "Here’s your address – feel free to share it within your whole network and your Lisk friends.": "Here’s your address – feel free to share it within your whole network and your Lisk friends.",
+  "Here’s your address! You can now securely store and manage your LSK tokens.": "Here’s your address! You can now securely store and manage your LSK tokens.",
   "Hide passphrase": "Hide passphrase",
   "Hide the QR code": "Hide the QR code",
   "High": "High",
   "How do you like the hub?": "How do you like the hub?",
   "How is Lisk transparent?": "How is Lisk transparent?",
   "How we recommend to store it.": "How we recommend to store it.",
   "I have read and agree to the Terms of Use": "I have read and agree to the Terms of Use",
+  "If you are typing out your passphrase you can use tab or space to go to the next field.": "If you are typing out your passphrase you can use tab or space to go to the next field.",
   "If you see this field, you have registered a second passphrase in past and it is required to confirm transactions.": "If you see this field, you have registered a second passphrase in past and it is required to confirm transactions.",
   "If you’re not sure how to do this please follow the": "If you’re not sure how to do this please follow the",
   "In": "In",
@@ -431,8 +433,8 @@
   "Sign back in": "Sign back in",
   "Sign in": "Sign in",
   "Sign in to view recent transactions": "Sign in to view recent transactions",
-  "Sign in with a Hardware Wallet": "Sign in with a Hardware Wallet",
-  "Sign in with a Passphrase": "Sign in with a Passphrase",
+  "Sign in with a hardware wallet": "Sign in with a hardware wallet",
+  "Sign in with a passphrase": "Sign in with a passphrase",
   "Sign out": "Sign out",
   "Simply scan the QR code using the Lisk Mobile app or any other QR code reader": "Simply scan the QR code using the Lisk Mobile app or any other QR code reader",
   "Some delegates offer to share a percentage of their earnings from running the network with the users who vote for them.": "Some delegates offer to share a percentage of their earnings from running the network with the users who vote for them.",
@@ -533,7 +535,7 @@
   "Welcome to the Lisk Hub!": "Welcome to the Lisk Hub!",
   "What is Lisk Academy?": "What is Lisk Academy?",
   "What is a Lisk ID?": "What is a Lisk ID?",
-  "What is your passphrase?": "What is your passphrase?",
+  "What is a passphrase?": "What is a passphrase?",
   "What is your second passphrase?": "What is your second passphrase?",
   "What's New...": "What's New...",
   "Whoops, that page is gone.": "Whoops, that page is gone.",
@@ -547,7 +549,6 @@
   "You can find the {{activeToken}} token on all of the worlds top exchanges and send them to your unique {{currency}} address:": "You can find the {{activeToken}} token on all of the worlds top exchanges and send them to your unique {{currency}} address:",
   "You can print your passphrase and store it in a safe place. ": "You can print your passphrase and store it in a safe place. ",
   "You can share your Lisk ID with anyone you wish, but never reveal your passphrase to anyone as it would allow full access to your account.": "You can share your Lisk ID with anyone you wish, but never reveal your passphrase to anyone as it would allow full access to your account.",
-  "You can use tab or space to go to the next field.": "You can use tab or space to go to the next field.",
   "You can use your passphrase to sign a message. This signed message can prove that you are the owner of the account, since only your passphrase can produce it. We reccomend including date & time or a specific keyword.": "You can use your passphrase to sign a message. This signed message can prove that you are the owner of the account, since only your passphrase can produce it. We reccomend including date & time or a specific keyword.",
   "You don’t have any bookmarks yet.": "You don’t have any bookmarks yet.",
   "You don’t have enough balance to enable it. 5 LSK is required.": "You don’t have enough balance to enable it. 5 LSK is required.",
@@ -568,7 +569,6 @@
   "Your account was created!": "Your account was created!",
   "Your new Lisk Wallet enables you to take full control of your LSK tokens. Secure, intuitive and robust Hub is your ultimate gateway to Lisk Ecosystem.": "Your new Lisk Wallet enables you to take full control of your LSK tokens. Secure, intuitive and robust Hub is your ultimate gateway to Lisk Ecosystem.",
   "Your nickname": "Your nickname",
-  "Your passphrase is both your login and passphrase to your Lisk Hub. It is provided during account registration.": "Your passphrase is both your login and passphrase to your Lisk Hub. It is provided during account registration.",
   "Your passphrase is your login and password combined. Keep it \nsafe as it is the only way to access your wallet.": "Your passphrase is your login and password combined. Keep it \nsafe as it is the only way to access your wallet.",
   "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.": "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.",
   "Your signed message": "Your signed message",

diff --git a/src/components/loginV2/loginV2.js b/src/components/loginV2/loginV2.js
@@ -142,15 +142,15 @@ class LoginV2 extends React.Component {
                 {t('Sign in')}
               </span>
               <h1>
-                {t('Sign in with a Passphrase')}
+                {t('Sign in with a passphrase')}
               </h1>
               <p>
                 {t('New to Lisk? ')}
                 <Link
                   className={`${styles.link}`}
                   to={routes.register.path}
                 >
-                  {t('Create an Account')}
+                  {t('Create an account')}
                 </Link>
               </p>
             </div>
@@ -161,27 +161,27 @@ class LoginV2 extends React.Component {
                   {t('Passphrase')}
                   <Tooltip
                     className={`${styles.tooltip}`}
-                    title={t('What is your passphrase?')}
+                    title={t('What is a passphrase?')}
                     footer={(
                       <a
                         href={links.whatIsAnPassphrase}
                         tabIndex="-1"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
-                        {t('Read More')}
+                        {t('Read more')}
                       </a>
 )}
                   >
                     <React.Fragment>
                       <p className={`${styles.tooltipText}`}>
-                        {t('Your passphrase is both your login and passphrase to your Lisk Hub. It is provided during account registration.')}
+                        {t('A passphrase is a combination of a username and password. You saved your passphrase when registering your Lisk account.')}
                       </p>
                       <p className={`${styles.tooltipText}`}>
-                        {t('You can use tab or space to go to the next field.')}
+                        {t('If you are typing out your passphrase you can use tab or space to go to the next field.')}
                       </p>
                       <p className={`${styles.tooltupText}`}>
-                        {t('For longer passphrases, simply paste it in the first input field.')}
+                        {t('For longer passphrases, simply paste them in the first input field.')}
                       </p>
                     </React.Fragment>
                   </Tooltip>
@@ -203,11 +203,11 @@ class LoginV2 extends React.Component {
                     || !this.state.isValid
                     || this.state.passphrase === ''}
                 >
-                  {t('Sign In')}
+                  {t('Sign in')}
                 </PrimaryButtonV2>
                 <Link to={routes.splashscreen.path}>
                   <TertiaryButtonV2 className={`${styles.button} ${styles.backButton}`}>
-                    {t('Go Back')}
+                    {t('Go back')}
                   </TertiaryButtonV2>
                 </Link>
               </div>

diff --git a/src/components/register/accountCreated.js b/src/components/register/accountCreated.js
@@ -15,7 +15,7 @@ const AccountCreated = ({ t, account }) => (
       <h1>
         {t('Your account was created!')}
       </h1>
-      <p className={styles.text}>{t('Here’s your address – feel free to share it within your whole network and your Lisk friends.')}</p>
+      <p className={styles.text}>{t('Here’s your address! You can now securely store and manage your LSK tokens.')}</p>
     </div>
 
     <div className={`${styles.accountHolder}`}>

diff --git a/src/components/splashscreen/splashscreen.js b/src/components/splashscreen/splashscreen.js
@@ -85,22 +85,22 @@ class Splashscreen extends React.Component {
               <h1>{t('Welcome to the Lisk Hub!')}</h1>
               <p>
                 {
-                t('Create an Account or Sign in to manage your LSK Tokens, become a Delegate or vote for another Delegates.')
+                t('Create an account or sign in to manage your LSK, vote for who secures the network or become a delegate.')
               }
               </p>
             </div>
             <Link className={`${styles.button} login-button`} to={routes.loginV2.path}>
-              <SecondaryButtonV2 className="light">{t('Sign In')}</SecondaryButtonV2>
+              <SecondaryButtonV2 className="light">{t('Sign in')}</SecondaryButtonV2>
             </Link>
             <Link className={`${styles.button} new-account-button`} to={routes.register.path}>
-              <PrimaryButtonV2>{t('Create an Account')}</PrimaryButtonV2>
+              <PrimaryButtonV2>{t('Create an account')}</PrimaryButtonV2>
             </Link>
             <span className={styles.separator}>
               <span>{t('or')}</span>
             </span>
             <span className={styles.linkWrapper}>
               <Link className={`${styles.link} explore-as-guest-button`} to={routes.dashboard.path}>
-                {t('Explore as a Guest')}
+                {t('Explore as a guest')}
               </Link>
               <Tooltip
                 className={`${styles.tooltip}`}
@@ -120,7 +120,7 @@ class Splashscreen extends React.Component {
 
             <span className={styles.linkWrapper}>
               <Link className={`${styles.link} signin-hwWallet-button`} to={routes.hwWallet.path}>
-                {t('Sign in with a Hardware Wallet')}
+                {t('Sign in with a hardware wallet')}
               </Link>
             </span>
           </div>

diff --git a/src/components/splashscreen/splashscreen.test.js b/src/components/splashscreen/splashscreen.test.js
@@ -78,9 +78,9 @@ describe('V2 SplashScreen', () => {
   });
 
   it('Should render all links, Sign in, Create an Account and Explre as Guest', () => {
-    expect(wrapper.find('.login-button button').text()).toEqual('Sign In');
-    expect(wrapper.find('.new-account-button button').text()).toEqual('Create an Account');
-    expect(wrapper.find('.link').at(0).text()).toEqual('Explore as a Guest');
+    expect(wrapper.find('.login-button button').text()).toEqual('Sign in');
+    expect(wrapper.find('.new-account-button button').text()).toEqual('Create an account');
+    expect(wrapper.find('.link').at(0).text()).toEqual('Explore as a guest');
   });
 
   describe('History management', () => {

diff --git a/src/components/transactionsV2/transactionsOverviewHeader/transactionsOverviewHeader.test.js b/src/components/transactionsV2/transactionsOverviewHeader/transactionsOverviewHeader.test.js
@@ -102,7 +102,7 @@ describe('Transactions Overview Header', () => {
         }}
         />
       </MemoryRouter>, options);
-      expect(wrapper.find('.bookmark-account button').first().text()).to.equal('Edit bookmark');
+      expect(wrapper.find('.bookmark-account button').first().text()).to.equal('Account bookmarked');
     });
   });
 });
diff --git a/test/cypress/e2e/login.spec.js b/test/cypress/e2e/login.spec.js
@@ -17,7 +17,7 @@ describe('Login Page', () => {
   it(`Opens by url ${urls.login}`, () => {
     cy.visit(urls.login);
     cy.url().should('include', urls.login);
-    cy.get(ss.app).contains('Sign in with a Passphrase');
+    cy.get(ss.app).contains('Sign in with a passphrase');
   });
   /**
    * First time app is opened sign in happens to mainnet

diff --git a/test/cypress/e2e/splashscreen.spec.js b/test/cypress/e2e/splashscreen.spec.js
@@ -11,7 +11,7 @@ describe('Splashscreen', () => {
     cy.visit('/');
     cy.get(ss.loginBtn).click();
     cy.url().should('include', urls.login);
-    cy.get(ss.app).contains('Sign in with a Passphrase');
+    cy.get(ss.app).contains('Sign in with a passphrase');
   });
   /**
    * 'Create an account' link leads to registration page

diff --git a/test/cypress/e2e/wallet_othersAccount.spec.js b/test/cypress/e2e/wallet_othersAccount.spec.js
@@ -75,7 +75,7 @@ describe('Wallet Others account', () => {
     cy.reload();
     cy.wait('@requestDelegatesData');
     cy.get(ss.accountName).contains('Bob');
-    cy.get(ss.bookmarkAccountBtn).contains('Edit bookmark');
+    cy.get(ss.bookmarkAccountBtn).contains('Account bookmarked');
     cy.get(ss.bookmarkAccountBtn).click();
     cy.get(ss.confirmAddToBookmarks).click()
       .should(() => {