From 1abd63a72c22f15e72929d9cafdee5dda7a53046 Mon Sep 17 00:00:00 2001 From: Manu Date: Thu, 29 Dec 2022 14:47:27 +0530 Subject: [PATCH] :memo: Update grammer and sentences (#4683) --- libs/wcm/constants/permissions.js | 2 +- src/locales/en/common.json | 70 ++++++++++--------- src/modules/account/components/.gitkeep | 0 .../components/AccountRow/AccountRow.css | 6 +- .../components/AccountRow/AccountRow.js | 2 +- .../AddAccountByFile/AddAccountByFile.test.js | 10 +-- .../AddAccountBySecretRecovery.test.js | 4 +- .../AddAccountForm/AddAccountForm.js | 4 +- .../AddAccountForm/AddAccountForm.test.js | 2 +- .../AddAccountOptions/AddAccountOptions.js | 8 +-- .../AddAccountOptions.test.js | 8 +-- .../BackupRecoveryPhraseFlow.js | 4 +- .../BackupRecoveryPhraseFlow.test.js | 10 +-- .../components/EditAccount/EditAccount.js | 4 +- .../EditAccount/EditAccount.test.js | 4 +- .../RemoveAccount/RemoveAccount.test.js | 6 +- .../RemoveConfirmation/RemoveConfirmation.js | 2 +- .../RemoveConfirmation.test.js | 6 +- .../components/RemoveSuccess/RemoveSuccess.js | 2 +- .../RemoveSuccess/RemoveSuccess.test.js | 4 +- src/modules/auth/components/.gitkeep | 0 .../ChooseAvatar/chooseAvatar.test.js | 4 +- .../EnterPasswordForm/EnterPasswordForm.js | 4 +- .../RestoreAccountForm/RestoreAccountForm.js | 2 +- .../RestoreAccountForm.test.js | 2 +- .../SavePassphrase/SavePassphrase.js | 4 +- .../SetPasswordForm/SetPasswordForm.js | 4 +- .../SetPasswordForm/SetPasswordForm.test.js | 2 +- .../SetPasswordSuccess/SetPasswordSuccess.js | 2 +- src/modules/auth/components/Signin/login.js | 2 +- .../SignupSuccessed/accountCreated.js | 7 +- .../auth/components/passphraseBackup/index.js | 1 - .../components/ConnectionProposal/index.js | 6 +- .../ConnectionStatus/ConnectionStatus.js | 4 +- .../ConnectionStatus/ConnectionStatus.test.js | 2 +- .../components/ConnectionSummary/index.js | 6 +- .../components/RequestSummary/index.js | 2 +- .../components/RequestSummary/index.test.js | 2 +- .../components/SessionManager/SessionRow.js | 2 +- .../components/SessionManager/index.js | 2 +- .../explore/__fixtures__/mockBlockchainApp.js | 2 +- .../explore/components/.gitkeep | 0 .../BlockchainApplications.js | 2 +- .../BlockchainApplications.test.js | 2 +- .../AddApplicationSuccess.js | 4 +- .../AddApplicationSuccess.test.js | 2 +- .../ApplicationManagementRow.css | 8 +-- .../ApplicationManagementRow.js | 4 +- .../RemoveApplicationDetails.js | 4 +- .../RemoveApplicationSuccess.js | 2 +- .../RemoveApplicationSuccess.test.js | 2 +- .../manage/store/.gitkeep | 0 .../manage/utils/.gitkeep | 0 src/modules/bookmark/components/.gitkeep | 0 .../BookmarksList/BookmarksList.test.js | 2 +- src/modules/bookmark/store/action.test.js | 2 +- src/modules/bookmark/store/middleware.test.js | 2 +- .../components/calendar/calendarUtils.js | 6 +- .../components/charts/chartOptions.test.js | 10 +-- .../DelegateSummary/DelegateSummary.js | 2 +- .../DelegatesMonitorView/delegates.css | 2 +- .../components/DelegatesTable/dataColumns.js | 2 +- .../delegateProfile/delegateProfile.test.js | 2 +- .../delegateProfile/delegateVotesView.test.js | 6 +- .../legacy/components/Status/status.test.js | 4 +- .../components/Status/statusMessages.js | 10 ++- .../components/signMessageView/index.js | 2 +- .../message/components/signedMessage/index.js | 2 +- .../components/validityStatus/index.js | 4 +- .../verifyMessageView/index.test.js | 10 +-- .../discreetModeToggle/discreetModeToggle.js | 2 +- .../discreetModeToggle.test.js | 4 +- .../fungible/components/SendForm/SendForm.js | 6 +- .../components/SendStatus/status.test.js | 2 +- .../RequestedTxStatus.test.js | 2 +- .../components/RequestedTxStatus/index.js | 2 +- .../TxSignatureCollector.js | 4 +- .../TxSignatureCollector.test.js | 4 +- .../transaction/configuration/statusConfig.js | 2 +- .../components/passphraseRenderer/index.js | 2 +- tests/cypress/features/verifyMessage.feature | 6 +- .../features/verifyMessage/verifyMessage.js | 2 +- 82 files changed, 186 insertions(+), 170 deletions(-) delete mode 100644 src/modules/account/components/.gitkeep delete mode 100644 src/modules/auth/components/.gitkeep delete mode 100644 src/modules/blockchainApplication/explore/components/.gitkeep delete mode 100644 src/modules/blockchainApplication/manage/store/.gitkeep delete mode 100644 src/modules/blockchainApplication/manage/utils/.gitkeep delete mode 100644 src/modules/bookmark/components/.gitkeep diff --git a/libs/wcm/constants/permissions.js b/libs/wcm/constants/permissions.js index 96f7cd83e8..5df6714b81 100644 --- a/libs/wcm/constants/permissions.js +++ b/libs/wcm/constants/permissions.js @@ -1,5 +1,5 @@ export const SIGNING_METHODS = { - SIGN_TRANSACTION: { key: 'sign_transaction', title: 'Sign transaction' }, + SIGN_TRANSACTION: { key: 'sign_transaction', title: 'Signature request' }, SIGN_MESSAGE: { key: 'sign_message', title: 'Sign message' }, }; diff --git a/src/locales/en/common.json b/src/locales/en/common.json index b8577cf994..e5d6e086ed 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -15,6 +15,7 @@ "Account name": "Account name", "Account username": "Account username", "Account was removed": "Account was removed", + "Account(s) to use on this application": "Account(s) to use on this application", "Accounts": "Accounts", "Action": "Action", "Active": "Active", @@ -31,6 +32,7 @@ "Add to votes": "Add to votes", "Add to voting queue": "Add to voting queue", "Add to watched": "Add to watched", + "Add your account": "Add your account", "Added votes": "Added votes", "Address": "Address", "Address already bookmarked": "Address already bookmarked", @@ -55,7 +57,6 @@ "Amount to unlock": "Amount to unlock", "An error occurred while rejecting the pairing request from {{name}}": "An error occurred while rejecting the pairing request from {{name}}", "An error occurred while rendering this page": "An error occurred while rendering this page", - "An error occurred while responding to {{name}}": "An error occurred while responding to {{name}}", "An error occurred while sending your transaction to the network. Please try again.": "An error occurred while sending your transaction to the network. Please try again.", "An error occurred while signing your transaction. Please try again.": "An error occurred while signing your transaction. Please try again.", "An error occurred.": "An error occurred.", @@ -64,7 +65,6 @@ "Appearance": "Appearance", "Application has now been removed": "Application has now been removed", "Application is terminated and can no longer be managed.": "Application is terminated and can no longer be managed.", - "Application pairing": "Application pairing", "Applications": "Applications", "Apply filters": "Apply filters", "At this moment there is a connection problem with the tweets feed": "At this moment there is a connection problem with the tweets feed", @@ -81,7 +81,6 @@ "Back to wallet": "Back to wallet", "Balance": "Balance", "Balance after reclaiming:": "Balance after reclaiming:", - "Balance reclaimed successfully": "Balance reclaimed successfully", "Balance to reclaim": "Balance to reclaim", "Balance:": "Balance:", "Based on your available balance and rounded down to a multiple of 10 LSK, your total remaining balance is {{maxAmount}} LSK": "Based on your available balance and rounded down to a multiple of 10 LSK, your total remaining balance is {{maxAmount}} LSK", @@ -97,7 +96,6 @@ "Blocks overview": "Blocks overview", "Blog": "Blog", "Bookmarks": "Bookmarks", - "Bridge application": "Bridge application", "Bytes counter": "Bytes counter", "CMB :": "CMB :", "Cancel": "Cancel", @@ -108,6 +106,7 @@ "Changed votes": "Changed votes", "Check for Updates...": "Check for Updates...", "Choose account": "Choose account", + "Choose an option to add your account to Lisk wallet.": "Choose an option to add your account to Lisk wallet.", "Choose application URL": "Choose application URL", "Choose your avatar": "Choose your avatar", "Clear all filters": "Clear all filters", @@ -125,25 +124,25 @@ "Confirmations refer to the number of blocks added to the {{token}} blockchain after a transaction has been submitted. The more confirmations registered, the more secure the transaction becomes.": "Confirmations refer to the number of blocks added to the {{token}} blockchain after a transaction has been submitted. The more confirmations registered, the more secure the transaction becomes.", "Confirmed": "Confirmed", "Connect": "Connect", + "Connect Wallet": "Connect Wallet", "Connect and save": "Connect and save", + "Connect wallet": "Connect wallet", "Connect your Hardware Wallet": "Connect your Hardware Wallet", "Connected": "Connected", "Connected peers": "Connected peers", "Connection ID": "Connection ID", "Connection summary is not ready yet.": "Connection summary is not ready yet.", - "Connections": "Connections", "Consecutive missed blocks": "Consecutive missed blocks", "Continue": "Continue", - "Continue to Add account": "Continue to Add account", - "Continue to Dashboard": "Continue to Dashboard", - "Continue to Manage Accounts": "Continue to Manage Accounts", - "Continue to Wallet": "Continue to Wallet", + "Continue to dashboard": "Continue to dashboard", + "Continue to manage accounts": "Continue to manage accounts", + "Continue to wallet": "Continue to wallet", "Continue voting": "Continue voting", "Copied": "Copied", "Copied!": "Copied!", "Copy": "Copy", "Copy address": "Copy address", - "Copy and send to the application": "Copy and send to the application", + "Copy and return to application": "Copy and return to application", "Copy link": "Copy link", "Copy public key": "Copy public key", "Copy to clipboard": "Copy to clipboard", @@ -177,7 +176,7 @@ "Deposited:": "Deposited:", "Description": "Description", "Details": "Details", - "Diconnect": "Diconnect", + "Disconnect": "Disconnect", "Disable dark mode": "Disable dark mode", "Disable discreet mode": "Disable discreet mode", "Disconnected": "Disconnected", @@ -193,7 +192,6 @@ "Edit": "Edit", "Edit Vote": "Edit Vote", "Edit account name": "Edit account name", - "Edit account name successful": "Edit account name successful", "Edit bookmark": "Edit bookmark", "Edit vote": "Edit vote", "Effortlessly send and receive tokens": "Effortlessly send and receive tokens", @@ -205,13 +203,14 @@ "Enable dark mode": "Enable dark mode", "Enable dark mode.": "Enable dark mode.", "Enable discreet mode": "Enable discreet mode", - "Enable discreet mode when signed in (optional)": "Enable discreet mode when signed in (optional)", + "Enable discreet mode (optional)": "Enable discreet mode (optional)", "Enable network switcher to connect to different networks or service nodes when signing in.": "Enable network switcher to connect to different networks or service nodes when signing in.", + "Encountered an error while connecting to {{name}} application.": "Encountered an error while connecting to {{name}} application.", "English": "English", - "Enter WalletConnect URI": "Enter WalletConnect URI", + "Enter connection URI": "Enter connection URI", "Enter name": "Enter name", "Enter password": "Enter password", - "Enter your password": "Enter your password", + "Enter your account password": "Enter your account password", "Enter your secret recovery phrase to manage your account.": "Enter your secret recovery phrase to manage your account.", "Error": "Error", "Error retrieving conversion rates.": "Error retrieving conversion rates.", @@ -239,6 +238,7 @@ "Found several devices, choose the one you’d like to access": "Found several devices, choose the one you’d like to access", "From": "From", "From Application": "From Application", + "From application": "From application", "Generated by": "Generated by", "Generator key": "Generator key", "German": "German", @@ -249,7 +249,7 @@ "Go to dashboard": "Go to dashboard", "Go to wallet": "Go to wallet", "Got it, thanks!": "Got it, thanks!", - "Great! You have an account now": "Great! You have an account now", + "Great! Your account is now created": "Great! Your account is now created", "Group": "Group", "Height": "Height", "Help": "Help", @@ -273,7 +273,6 @@ "Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will be added to the voting queue.": "Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will be added to the voting queue.", "Index": "Index", "Information": "Information", - "Input WalletConnect URI to pair with an application": "Input WalletConnect URI to pair with an application", "Input transaction data": "Input transaction data", "Input view": "Input view", "Insert a vote amount for this delegate. Your new vote will be added to the voting queue.": "Insert a vote amount for this delegate. Your new vote will be added to the voting queue.", @@ -400,6 +399,7 @@ "Passphrase:": "Passphrase:", "Password should be a combination of uppercase and lowercase alpha numeric characters with length more than 8": "Password should be a combination of uppercase and lowercase alpha numeric characters with length more than 8", "Paste": "Paste", + "Paste WalletConnect URI to connect your application to Lisk Desktop.": "Paste WalletConnect URI to connect your application to Lisk Desktop.", "Paste transaction value": "Paste transaction value", "Peer connectivity": "Peer connectivity", "Peer heights": "Peer heights", @@ -410,7 +410,6 @@ "Perfect! Application has now been added": "Perfect! Application has now been added", "Perfect! You're all set": "Perfect! You're all set", "Performance": "Performance", - "Permissions": "Permissions", "Personalize each transaction with a custom message.": "Personalize each transaction with a custom message.", "Please carefully write down these 12 words and store them in a safe place.": "Please carefully write down these 12 words and store them in a safe place.", "Please check the address": "Please check the address", @@ -427,6 +426,7 @@ "Please select the account you’d like to sign in to or": "Please select the account you’d like to sign in to or", "Please sign in": "Please sign in", "Please use ": "Please use ", + "Please write down these 12 words carefully, and store them in a safe place.": "Please write down these 12 words carefully, and store them in a safe place.", "Port": "Port", "Previous": "Previous", "Print it on paper and store it in a safe place": "Print it on paper and store it in a safe place", @@ -451,9 +451,11 @@ "Recipient": "Recipient", "Recipient Address": "Recipient Address", "Recipient Application": "Recipient Application", + "Recipient address": "Recipient address", "Reclaim": "Reclaim", "Reclaim LSK tokens": "Reclaim LSK tokens", - "Redirecting to dashboard...": "Redirecting to dashboard...", + "Reclaim LSK tokens failed": "Reclaim LSK tokens failed", + "Reclaimed LSK tokens": "Reclaimed LSK tokens", "Redo": "Redo", "Register delegate": "Register delegate", "Register multisignature": "Register multisignature", @@ -490,6 +492,7 @@ "Restart app": "Restart app", "Restore from JSON file": "Restore from JSON file", "Restore your encrypted secret recovery phrase.": "Restore your encrypted secret recovery phrase.", + "Returning to application...": "Returning to application...", "Review and sign": "Review and sign", "Reward": "Reward", "Rewards (LSK)": "Rewards (LSK)", @@ -503,7 +506,6 @@ "Save Account": "Save Account", "Save changes": "Save changes", "Save it on an encrypted hard drive: USB key or a backup drive": "Save it on an encrypted hard drive: USB key or a backup drive", - "Save your secret recovery phrase": "Save your secret recovery phrase", "Scan address": "Scan address", "Search application": "Search application", "Search by name": "Search by name", @@ -512,14 +514,13 @@ "Search token": "Search token", "Search within the network...": "Search within the network...", "Secret recovery phrase": "Secret recovery phrase", + "Secret recovery phrase (12-24 mnemonic phrases supported)": "Secret recovery phrase (12-24 mnemonic phrases supported)", "Security": "Security", "Select All": "Select All", "Select Network": "Select Network", - "Select accounts(s) to use on this application": "Select accounts(s) to use on this application", "Select all": "Select all", "Select device": "Select device", "Select network": "Select network", - "Select the applicable mode.": "Select the applicable mode.", "Selected account": "Selected account", "Send": "Send", "Send Tokens": "Send Tokens", @@ -531,7 +532,7 @@ "Send {{token}} here": "Send {{token}} here", "Sender": "Sender", "Session timed out": "Session timed out", - "Set up device password": "Set up device password", + "Set up your account password": "Set up your account password", "Settings": "Settings", "Settings saved!": "Settings saved!", "Share": "Share", @@ -546,10 +547,13 @@ "Sign message": "Sign message", "Sign multisignature transaction": "Sign multisignature transaction", "Signature": "Signature", + "Signature is correct": "Signature is correct", + "Signature is incorrect": "Signature is incorrect", "Signed": "Signed", "Signed message": "Signed message", "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.", "Since you want to reclaim your LSK on the new blockchain, you need to pay the network fee from your new account.": "Since you want to reclaim your LSK on the new blockchain, you need to pay the network fee from your new account.", + "Site permissions": "Site permissions", "Sorry, we couldn’t find the page you were looking for. We suggest that you return to the main dashboard.": "Sorry, we couldn’t find the page you were looking for. We suggest that you return to the main dashboard.", "Staked": "Staked", "Standby delegates": "Standby delegates", @@ -560,6 +564,7 @@ "Stay Informed": "Stay Informed", "Store this document in a safe place.": "Store this document in a safe place.", "Submitting the transaction": "Submitting the transaction", + "Successfully edited, now you can download the encrypted secret recovery phrase to this effect.": "Successfully edited, now you can download the encrypted secret recovery phrase to this effect.", "Successfully paired with {{name}}": "Successfully paired with {{name}}", "Switch account": "Switch account", "Terminated": "Terminated", @@ -577,8 +582,6 @@ "The minimum required balance for this action is {{minRequiredBalance}} {{token}}": "The minimum required balance for this action is {{minRequiredBalance}} {{token}}", "The number of transactions submitted over the selected time period.": "The number of transactions submitted over the selected time period.", "The provided amount is higher than available voting balance.": "The provided amount is higher than available voting balance.", - "The signature is correct": "The signature is correct", - "The signature is incorrect": "The signature is incorrect", "The statistics shown only reflects peers connected to the current Lisk Service node.": "The statistics shown only reflects peers connected to the current Lisk Service node.", "The total amount of votes received for a delegate.": "The total amount of votes received for a delegate.", "The total amount of votes received from this account.": "The total amount of votes received from this account.", @@ -600,7 +603,7 @@ "This account doesn’t have any votes.": "This account doesn’t have any votes.", "This account needs to be reclaimed": "This account needs to be reclaimed", "This account requires {{numberOfSignatures}} signatures to create a valid transaction.": "This account requires {{numberOfSignatures}} signatures to create a valid transaction.", - "This account will no longer be stored on this device. You can backup your secret recovery phrase before you remove it.": "This account will no longer be stored on this device. You can backup your secret recovery phrase before you remove it.", + "This account will no longer be stored on this device. You can backup your secret recovery phrase before removing it.": "This account will no longer be stored on this device. You can backup your secret recovery phrase before removing it.", "This avatar will be linked to your new Lisk address.": "This avatar will be linked to your new Lisk address.", "This delegate has been permanently banned": "This delegate has been permanently banned", "This delegate is among the first 101 delegates by delegate weight.": "This delegate is among the first 101 delegates by delegate weight.", @@ -609,9 +612,11 @@ "This is a legacy account and can not be used on this network.": "This is a legacy account and can not be used on this network.", "This is a multisignature account that is controlled by a group of accounts.": "This is a multisignature account that is controlled by a group of accounts.", "This is not a valid public key. Please enter the correct public key.": "This is not a valid public key. Please enter the correct public key.", - "This password is used to encrypt your secret recovery phrase, which will be used for managing your account.": "This password is used to encrypt your secret recovery phrase, which will be used for managing your account.", + "This password will be used for decrypting your account every time you initiate any transaction from your wallet, and also during backup or removal of an account from the wallet.": "This password will be used for decrypting your account every time you initiate any transaction from your wallet, and also during backup or removal of an account from the wallet.", + "This transaction was initiated from another application for signature request.": "This transaction was initiated from another application for signature request.", "To": "To", "To Application": "To Application", + "To application": "To application", "To create a signed message use the \"Sign message\" tool in the sidebar.": "To create a signed message use the \"Sign message\" tool in the sidebar.", "To provide a required signature, use the \"Sign multisignature\" tool in the sidebar.\"": "To provide a required signature, use the \"Sign multisignature\" tool in the sidebar.\"", "To recover, you can try to reload the page, by clicking the button below. If the problem persists, report the error via email.": "To recover, you can try to reload the page, by clicking the button below. If the problem persists, report the error via email.", @@ -688,6 +693,7 @@ "Wallet": "Wallet", "Wallet address:": "Wallet address:", "Wallet balance": "Wallet balance", + "Wallet connections": "Wallet connections", "Wallet details": "Wallet details", "Warning: Session Timeout": "Warning: Session Timeout", "Watched": "Watched", @@ -707,10 +713,10 @@ "You can download or copy the transaction and share it with other members.": "You can download or copy the transaction and share it with other members.", "You can explore the decentralized network, monitor wallet activities, blocks, transactions, and inspect delegates.": "You can explore the decentralized network, monitor wallet activities, blocks, transactions, and inspect delegates.", "You can learn more": "You can learn more", - "You can now download encrypted secret recovery phrase to this effect.": "You can now download encrypted secret recovery phrase to this effect.", + "You can now add your account to Lisk Wallet by clicking on \"Continue to dashboard\", to be able to send and request tokens and much more.": "You can now add your account to Lisk Wallet by clicking on \"Continue to dashboard\", to be able to send and request tokens and much more.", "You can now download your encrypted secret recovery phrase and use it to add your account on other devices.": "You can now download your encrypted secret recovery phrase and use it to add your account on other devices.", "You can only vote in multiplies of 10 LSK.": "You can only vote in multiplies of 10 LSK.", - "You can see a list of your applications on the dashboard.": "You can see a list of your applications on the dashboard.", + "You can see a list of your applications on the application dropdown.": "You can see a list of your applications on the application dropdown.", "You cannot vote for this delegate": "You cannot vote for this delegate", "You don’t have any bookmarks yet.": "You don’t have any bookmarks yet.", "You have cancelled the transaction on your hardware wallet.": "You have cancelled the transaction on your hardware wallet.", @@ -718,8 +724,8 @@ "You have uploaded an incorrect file": "You have uploaded an incorrect file", "You haven't paired with any applications yet.": "You haven't paired with any applications yet.", "You will be able to:": "You will be able to:", + "Your LSK tokens could not be reclaimed, you can try again or report to us via email": "Your LSK tokens could not be reclaimed, you can try again or report to us via email", "Your account just received {{amount}} {{token}} {{message}}": "Your account just received {{amount}} {{token}} {{message}}", - "Your legacy balance was deposited to your account.": "Your legacy balance was deposited to your account.", "Your multisignatures groups": "Your multisignatures groups", "Your name": "Your name", "Your session will be timed out in {{time}} if no network activity occurs.": "Your session will be timed out in {{time}} if no network activity occurs.", @@ -727,9 +733,10 @@ "Your signature will replace one optional signature.": "Your signature will replace one optional signature.", "Your tokens and passphrase are safe.": "Your tokens and passphrase are safe.", "Your tokens associated with your secret recovery phrase are available to be reclaimed.": "Your tokens associated with your secret recovery phrase are available to be reclaimed.", + "Your tokens will be deposited to your account.": "Your tokens will be deposited to your account.", "Your transaction has been submitted and will appear in sender account's wallet after confirmation.": "Your transaction has been submitted and will appear in sender account's wallet after confirmation.", - "Your transaction has been submitted and will be confirmed in a few moments.": "Your transaction has been submitted and will be confirmed in a few moments.", "Your transaction is signed successfully.": "Your transaction is signed successfully.", + "Your transaction is submitted to network, you can now track the status of this transaction in your wallet.": "Your transaction is submitted to network, you can now track the status of this transaction in your wallet.", "Your username": "Your username", "Your vote has been added to your voting queue": "Your vote has been added to your voting queue", "[Tomorrow], hh:mm A": "[Tomorrow], hh:mm A", @@ -767,7 +774,6 @@ "{{deviceModel}} connected! Open the Lisk app on the device": "{{deviceModel}} connected! Open the Lisk app on the device", "{{deviceModel}} connected! Please provide a PIN number": "{{deviceModel}} connected! Please provide a PIN number", "{{length}} bytes left": "{{length}} bytes left", - "{{name}} is requesting a signature from your Lisk wallet.": "{{name}} is requesting a signature from your Lisk wallet.", "{{num}} months": "{{num}} months", "{{num}} week": "{{num}} week", "{{num}} year": "{{num}} year", diff --git a/src/modules/account/components/.gitkeep b/src/modules/account/components/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/account/components/AccountRow/AccountRow.css b/src/modules/account/components/AccountRow/AccountRow.css index cca1bb56c2..0d77a5f579 100644 --- a/src/modules/account/components/AccountRow/AccountRow.css +++ b/src/modules/account/components/AccountRow/AccountRow.css @@ -1,14 +1,14 @@ @import '../../../../../setup/react/app/mixins.css'; -.accountWraper:last-child { +.accountWrapper:last-child { border-bottom: none; } -.accountWraper:hover { +.accountWrapper:hover { opacity: 0.8; } -.accountWraper { +.accountWrapper { width: 100%; display: flex; flex-direction: row; diff --git a/src/modules/account/components/AccountRow/AccountRow.js b/src/modules/account/components/AccountRow/AccountRow.js index dade11694a..289c10ace1 100644 --- a/src/modules/account/components/AccountRow/AccountRow.js +++ b/src/modules/account/components/AccountRow/AccountRow.js @@ -13,7 +13,7 @@ function AccountRow({ account, onSelect, onRemove, truncate }) {
onSelect(account)} > diff --git a/src/modules/account/components/AddAccountByFile/AddAccountByFile.test.js b/src/modules/account/components/AddAccountByFile/AddAccountByFile.test.js index a772b2599e..2a771365dd 100644 --- a/src/modules/account/components/AddAccountByFile/AddAccountByFile.test.js +++ b/src/modules/account/components/AddAccountByFile/AddAccountByFile.test.js @@ -37,8 +37,8 @@ beforeEach(() => { }); describe('Add account by file flow', () => { - it('Should successfull go though the flow', async () => { - expect(screen.getByText('Add account')).toBeTruthy(); + it('Should successfully go though the flow', async () => { + expect(screen.getByText('Add your account')).toBeTruthy(); expect(screen.getByText('Restore your encrypted secret recovery phrase.')).toBeTruthy(); expect(screen.getByText('Continue')).toBeTruthy(); expect(screen.getByText('Go back')).toBeTruthy(); @@ -53,8 +53,8 @@ describe('Add account by file flow', () => { fireEvent(inputField, pasteEvent); fireEvent.click(screen.getByText('Continue')); - expect(screen.getByText('Enter your password')).toBeTruthy(); - expect(screen.getByText('Please provide your device password to backup the recovery phrase.')).toBeTruthy(); + expect(screen.getByText('Enter your account password')).toBeTruthy(); + expect(screen.getByText('Please enter your account password to backup the secret recovery phrase.')).toBeTruthy(); expect(screen.getByText(mockSavedAccounts[0].metadata.name)).toBeTruthy(); expect(screen.getByText(mockSavedAccounts[0].metadata.address)).toBeTruthy(); @@ -63,7 +63,7 @@ describe('Add account by file flow', () => { fireEvent.click(screen.getByText('Continue')); await waitFor(() => { expect(screen.getByText('Perfect! You\'re all set')).toBeTruthy(); - fireEvent.click(screen.getByText('Continue to Dashboard')); + fireEvent.click(screen.getByText('Continue to dashboard')); expect(props.history.push).toBeCalled(); }); }); diff --git a/src/modules/account/components/AddAccountBySecretRecovery/AddAccountBySecretRecovery.test.js b/src/modules/account/components/AddAccountBySecretRecovery/AddAccountBySecretRecovery.test.js index 41c2ff77e6..e534ad7457 100644 --- a/src/modules/account/components/AddAccountBySecretRecovery/AddAccountBySecretRecovery.test.js +++ b/src/modules/account/components/AddAccountBySecretRecovery/AddAccountBySecretRecovery.test.js @@ -40,7 +40,7 @@ beforeEach(() => { describe('Add account by secret recovery phrase flow', () => { it('Should successfully go though the flow', async () => { - expect(screen.getByText('Add account')).toBeTruthy(); + expect(screen.getByText('Add your account')).toBeTruthy(); expect(screen.getByText('Enter your secret recovery phrase to manage your account.')).toBeTruthy(); expect(screen.getByText('Continue')).toBeTruthy(); expect(screen.getByText('Go Back')).toBeTruthy(); @@ -71,7 +71,7 @@ describe('Add account by secret recovery phrase flow', () => { expect(screen.getByText('You can now download your encrypted secret recovery phrase and use it to add your account on other devices.')).toBeTruthy(); expect(screen.getByText('Download')).toBeTruthy(); - fireEvent.click(screen.getByText('Continue to Dashboard')); + fireEvent.click(screen.getByText('Continue to dashboard')); expect(props.history.push).toBeCalled(); }); diff --git a/src/modules/account/components/AddAccountForm/AddAccountForm.js b/src/modules/account/components/AddAccountForm/AddAccountForm.js index 904d74869d..06471510c2 100644 --- a/src/modules/account/components/AddAccountForm/AddAccountForm.js +++ b/src/modules/account/components/AddAccountForm/AddAccountForm.js @@ -63,7 +63,7 @@ const AddAccountFormContainer = ({
-

{t('Add account')}

+

{t('Add your account')}

{t('Enter your secret recovery phrase to manage your account.')}

@@ -75,7 +75,7 @@ const AddAccountFormContainer = ({ )}
- + 12 ? 24 : 12} maxInputsLength={24} diff --git a/src/modules/account/components/AddAccountForm/AddAccountForm.test.js b/src/modules/account/components/AddAccountForm/AddAccountForm.test.js index 0c0912adae..24398ac426 100644 --- a/src/modules/account/components/AddAccountForm/AddAccountForm.test.js +++ b/src/modules/account/components/AddAccountForm/AddAccountForm.test.js @@ -22,7 +22,7 @@ beforeEach(() => { describe('AddAccountForm', () => { it('should render successfully', () => { - expect(screen.getByText('Add account')).toBeTruthy(); + expect(screen.getByText('Add your account')).toBeTruthy(); expect( screen.getByText('Enter your secret recovery phrase to manage your account.') ).toBeTruthy(); diff --git a/src/modules/account/components/AddAccountOptions/AddAccountOptions.js b/src/modules/account/components/AddAccountOptions/AddAccountOptions.js index e1de6cbd96..ac5a57f679 100644 --- a/src/modules/account/components/AddAccountOptions/AddAccountOptions.js +++ b/src/modules/account/components/AddAccountOptions/AddAccountOptions.js @@ -27,18 +27,18 @@ const AddAccountOptions = ({ history }) => { className={`${styles.wrapper} ${grid['col-xs-12']} ${grid['col-md-12']} ${grid['col-lg-10']}`} >
-

{t('Add account')}

+

{t('Add your account')}

- {t('Select the applicable mode.')} + {t('Choose an option to add your account to Lisk wallet.')}

history.push(routes.addAccountBySecretRecovery.path)} /> history.push(routes.addAccountByFile.path)} /> diff --git a/src/modules/account/components/AddAccountOptions/AddAccountOptions.test.js b/src/modules/account/components/AddAccountOptions/AddAccountOptions.test.js index 688b0c0a94..6380536377 100644 --- a/src/modules/account/components/AddAccountOptions/AddAccountOptions.test.js +++ b/src/modules/account/components/AddAccountOptions/AddAccountOptions.test.js @@ -30,10 +30,10 @@ beforeEach(() => { describe('Add Account Choice', () => { it('Should render the add account choice page', async () => { - expect(screen.getByText('Add account')).toBeTruthy(); - expect(screen.getByText('Select the applicable mode.')).toBeTruthy(); + expect(screen.getByText('Add your account')).toBeTruthy(); + expect(screen.getByText('Choose an option to add your account to Lisk wallet.')).toBeTruthy(); expect(screen.getByText('Don’t have a Lisk account yet?')).toBeTruthy(); - expect(screen.getByText('Restore from file')).toBeTruthy(); + expect(screen.getByText('Restore from backup')).toBeTruthy(); expect(screen.getByText('Secret recovery phrase')).toBeTruthy(); }); @@ -43,7 +43,7 @@ describe('Add Account Choice', () => { }); it('should redirect to /account/add/add/by-file', async () => { - fireEvent.click(screen.getByText('Restore from file')); + fireEvent.click(screen.getByText('Restore from backup')); expect(props.history.push).toBeCalled(); }); }); diff --git a/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.js b/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.js index 5337f780e5..2abbc916ec 100644 --- a/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.js +++ b/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.js @@ -36,10 +36,10 @@ const BackupRecoveryPhraseFlow = ({ history }) => { - + diff --git a/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.test.js b/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.test.js index 029f74b803..4f26e3c650 100644 --- a/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.test.js +++ b/src/modules/account/components/BackupRecoveryPhraseFlow/BackupRecoveryPhraseFlow.test.js @@ -39,9 +39,9 @@ describe('Backup account recovery phrase flow', () => { it('Should successfully go though the flow', async () => { renderWithRouter(BackupRecoveryPhraseFlow, props); - expect(screen.getByText('Enter your password')).toBeTruthy(); + expect(screen.getByText('Enter your account password')).toBeTruthy(); expect( - screen.getByText('Please provide your device password to backup the recovery phrase.') + screen.getByText('Please enter your account password to backup the secret recovery phrase.') ).toBeTruthy(); expect(screen.getByTestId('password')).toBeTruthy(); expect(screen.getByText('Continue')).toBeTruthy(); @@ -51,13 +51,13 @@ describe('Backup account recovery phrase flow', () => { fireEvent.click(screen.getByText('Continue')); await waitFor(() => { - expect(screen.getByText('Save your secret recovery phrase')).toBeTruthy(); + expect(screen.getByText('Backup your secret recovery phrase')).toBeTruthy(); expect( screen.getByText('Keep it safe as it is the only way to access your wallet.') ).toBeTruthy(); expect( screen.getByText( - 'Please carefully write down these 12 words and store them in a safe place.' + 'Please write down these 12 words carefully, and store them in a safe place.' ) ).toBeTruthy(); expect(screen.getByText('Copy')).toBeTruthy(); @@ -90,7 +90,7 @@ describe('Backup account recovery phrase flow', () => { ).toBeTruthy(); expect(screen.getByText('Download')).toBeTruthy(); - fireEvent.click(screen.getByText('Continue to Wallet')); + fireEvent.click(screen.getByText('Continue to wallet')); }); }); }); diff --git a/src/modules/account/components/EditAccount/EditAccount.js b/src/modules/account/components/EditAccount/EditAccount.js index 63d905bf94..0008a855ba 100644 --- a/src/modules/account/components/EditAccount/EditAccount.js +++ b/src/modules/account/components/EditAccount/EditAccount.js @@ -17,8 +17,8 @@ const EditAccount = ({ history }) => { { history.push(routes.wallet.path); diff --git a/src/modules/account/components/EditAccount/EditAccount.test.js b/src/modules/account/components/EditAccount/EditAccount.test.js index 0e1f2e4258..c9d38c3b99 100644 --- a/src/modules/account/components/EditAccount/EditAccount.test.js +++ b/src/modules/account/components/EditAccount/EditAccount.test.js @@ -24,9 +24,9 @@ describe('Edit Account', () => { await waitFor(() => { fireEvent.click(screen.getByText('Done')); }); - expect(screen.getByText('Edit account name successful')).toBeInTheDocument(); + expect(screen.getByText('Edit account name')).toBeInTheDocument(); expect( - screen.getByText('You can now download encrypted secret recovery phrase to this effect.') + screen.getByText('Successfully edited, now you can download the encrypted secret recovery phrase to this effect.') ).toBeInTheDocument(); expect( screen.getByText(`encrypted_secret_recovery_phrase_${updatedAccountName}.json`) diff --git a/src/modules/account/components/RemoveAccount/RemoveAccount.test.js b/src/modules/account/components/RemoveAccount/RemoveAccount.test.js index 21e840659c..17bc8a0019 100644 --- a/src/modules/account/components/RemoveAccount/RemoveAccount.test.js +++ b/src/modules/account/components/RemoveAccount/RemoveAccount.test.js @@ -34,7 +34,7 @@ describe('Remove account', () => { it('Should successfully go though the flow', async () => { expect(screen.getByText('Remove Account?')).toBeTruthy(); - expect(screen.getByText('This account will no longer be stored on this device. You can backup your secret recovery phrase before you remove it.')).toBeTruthy(); + expect(screen.getByText('This account will no longer be stored on this device. You can backup your secret recovery phrase before removing it.')).toBeTruthy(); expect(screen.getByText('encrypted_secret_recovery_phrase.json')).toBeTruthy(); expect(screen.getByText('Download')).toBeTruthy(); expect(screen.getByText('Cancel')).toBeTruthy(); @@ -45,9 +45,9 @@ describe('Remove account', () => { await waitFor(() => { expect(screen.getByText('Account was removed')).toBeTruthy(); expect(screen.getByTestId('accountRemovedIcon')).toBeTruthy(); - expect(screen.getByText('Continue to Manage Accounts')).toBeTruthy(); + expect(screen.getByText('Continue to manage accounts')).toBeTruthy(); - fireEvent.click(screen.getByText('Continue to Manage Accounts')); + fireEvent.click(screen.getByText('Continue to manage accounts')); }); }); diff --git a/src/modules/account/components/RemoveConfirmation/RemoveConfirmation.js b/src/modules/account/components/RemoveConfirmation/RemoveConfirmation.js index 006f2f0adb..38fdbed0ba 100644 --- a/src/modules/account/components/RemoveConfirmation/RemoveConfirmation.js +++ b/src/modules/account/components/RemoveConfirmation/RemoveConfirmation.js @@ -33,7 +33,7 @@ const RemoveConfirmation = ({

{account?.metadata?.address}

{t( - 'This account will no longer be stored on this device. You can backup your secret recovery phrase before you remove it.', + 'This account will no longer be stored on this device. You can backup your secret recovery phrase before removing it.', )}

{ fireEvent.click(screen.getByText('Cancel')); }); - it('Should abort the removal when cancel with goback option', async () => { + it('Should abort the removal when cancel with go back option', async () => { const removeProps = { ...props, location: { hash: '' }, @@ -64,7 +64,7 @@ describe('RemoveConfirmationScreen', () => { expect(goBackFn).toHaveBeenCalled(); }); - it('Should successfully remove an accouunt', async () => { + it('Should successfully remove an account', async () => { expect(removeScreen.getByText('Remove Account?')).toBeTruthy(); expect( removeScreen.getByText(message), diff --git a/src/modules/account/components/RemoveSuccess/RemoveSuccess.js b/src/modules/account/components/RemoveSuccess/RemoveSuccess.js index 3e71b6f8fb..bb1dd7847a 100644 --- a/src/modules/account/components/RemoveSuccess/RemoveSuccess.js +++ b/src/modules/account/components/RemoveSuccess/RemoveSuccess.js @@ -14,7 +14,7 @@ const RemoveSuccess = ({ onComplete }) => {
- {t('Continue to Manage Accounts')} + {t('Continue to manage accounts')}
); diff --git a/src/modules/account/components/RemoveSuccess/RemoveSuccess.test.js b/src/modules/account/components/RemoveSuccess/RemoveSuccess.test.js index 11d5c5e34b..a1c7b29795 100644 --- a/src/modules/account/components/RemoveSuccess/RemoveSuccess.test.js +++ b/src/modules/account/components/RemoveSuccess/RemoveSuccess.test.js @@ -18,8 +18,8 @@ describe('Remove success component', () => { it('should render properly', async () => { expect(screen.getByText('Account was removed')).toBeTruthy(); expect(screen.getByTestId('accountRemovedIcon')).toBeTruthy(); - expect(screen.getByText('Continue to Manage Accounts')).toBeTruthy(); - fireEvent.click(screen.getByText('Continue to Manage Accounts')); + expect(screen.getByText('Continue to manage accounts')).toBeTruthy(); + fireEvent.click(screen.getByText('Continue to manage accounts')); await waitFor(() => { expect(props.onComplete).toBeCalled(); }); diff --git a/src/modules/auth/components/.gitkeep b/src/modules/auth/components/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/auth/components/ChooseAvatar/chooseAvatar.test.js b/src/modules/auth/components/ChooseAvatar/chooseAvatar.test.js index c1ff5c1384..a507959216 100644 --- a/src/modules/auth/components/ChooseAvatar/chooseAvatar.test.js +++ b/src/modules/auth/components/ChooseAvatar/chooseAvatar.test.js @@ -10,10 +10,10 @@ import ChooseAvatar from './chooseAvatar'; describe.skip('Register Process - Choose Avatar', () => { let wrapper; - const crypotObj = window.crypto || window.msCrypto; + const cryptoObj = window.crypto || window.msCrypto; const passphrases = [...Array(5)].map(() => generatePassphraseFromSeed({ - seed: [...crypotObj.getRandomValues(new Uint16Array(16))].map(x => (`00${(x % 256).toString(16)}`).slice(-2)), + seed: [...cryptoObj.getRandomValues(new Uint16Array(16))].map(x => (`00${(x % 256).toString(16)}`).slice(-2)), })); const accounts = passphrases.map(pass => ({ address: extractAddressFromPassphrase(pass), diff --git a/src/modules/auth/components/EnterPasswordForm/EnterPasswordForm.js b/src/modules/auth/components/EnterPasswordForm/EnterPasswordForm.js index 3968c093ff..c95cb7a39d 100644 --- a/src/modules/auth/components/EnterPasswordForm/EnterPasswordForm.js +++ b/src/modules/auth/components/EnterPasswordForm/EnterPasswordForm.js @@ -53,9 +53,9 @@ const EnterPasswordForm = ({ onEnterPasswordSuccess, title, encryptedAccount, is return ( -

{t('Enter your password')}

+

{t('Enter your account password')}

- {t(title || 'Please provide your device password to backup the recovery phrase.')} + {title || t('Please enter your account password to backup the secret recovery phrase.')}

{account?.metadata?.name &&

{account?.metadata?.name}

} diff --git a/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.js b/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.js index b906615783..adf17f2fe9 100644 --- a/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.js +++ b/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.js @@ -34,7 +34,7 @@ const RestoreAccountForm = ({ onBack, nextStep }) => { return ( <>
-

{t('Add account')}

+

{t('Add your account')}

{t('Restore your encrypted secret recovery phrase.')}

diff --git a/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.test.js b/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.test.js index eb6ff48ca9..250d79603a 100644 --- a/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.test.js +++ b/src/modules/auth/components/RestoreAccountForm/RestoreAccountForm.test.js @@ -53,7 +53,7 @@ describe('Restore account form component', () => { expect(wrapper.find('.feedback').text()).toBeTruthy(); }); - it('should show feedback erro text when uploading incorrect JSON file', async () => { + it('should show feedback error text when uploading incorrect JSON file', async () => { jest.spyOn(global, 'FileReader').mockImplementation(function () { this.readAsText = jest.fn(); }); diff --git a/src/modules/auth/components/SavePassphrase/SavePassphrase.js b/src/modules/auth/components/SavePassphrase/SavePassphrase.js index 76c91e636b..0109aefcf1 100644 --- a/src/modules/auth/components/SavePassphrase/SavePassphrase.js +++ b/src/modules/auth/components/SavePassphrase/SavePassphrase.js @@ -6,11 +6,11 @@ import PassphraseBackup from '@auth/components/passphraseBackup'; import registerStyles from '../Signup/register.css'; const SavePassphrase = ({ - t, passphrase, prevStep, nextStep, + t, passphrase, prevStep, nextStep, title, }) => ( <>
-

{t('Save your secret recovery phrase')}

+

{title || t('Save your secret recovery phrase')}

{t('Keep it safe as it is the only way to access your wallet.')}

-

{t('Set up device password')}

+

{t('Set up your account password')}

{t( - 'This password is used to encrypt your secret recovery phrase, which will be used for managing your account.' + 'This password will be used for decrypting your account every time you initiate any transaction from your wallet, and also during backup or removal of an account from the wallet.' )}

diff --git a/src/modules/auth/components/SetPasswordForm/SetPasswordForm.test.js b/src/modules/auth/components/SetPasswordForm/SetPasswordForm.test.js index d6ab6cee83..6593015f5d 100644 --- a/src/modules/auth/components/SetPasswordForm/SetPasswordForm.test.js +++ b/src/modules/auth/components/SetPasswordForm/SetPasswordForm.test.js @@ -131,7 +131,7 @@ describe('Set Password Form validation should work', () => { }); }); - it('should display an error if confirm password is not the same as the passowrd', async () => { + it('should display an error if confirm password is not the same as the password', async () => { makeSubmitActive(); fireEvent.change(password, { target: { value: 'Password1$' } }); fireEvent.change(cPassword, { target: { value: 'Password1@' } }); diff --git a/src/modules/auth/components/SetPasswordSuccess/SetPasswordSuccess.js b/src/modules/auth/components/SetPasswordSuccess/SetPasswordSuccess.js index 89220b5c7f..b6656d1e0e 100644 --- a/src/modules/auth/components/SetPasswordSuccess/SetPasswordSuccess.js +++ b/src/modules/auth/components/SetPasswordSuccess/SetPasswordSuccess.js @@ -33,7 +33,7 @@ function SetPasswordSuccess({

- {buttonText || t('Continue to Dashboard')} + {buttonText || t('Continue to dashboard')} diff --git a/src/modules/auth/components/Signin/login.js b/src/modules/auth/components/Signin/login.js index d7df36a1d4..db2f249c83 100644 --- a/src/modules/auth/components/Signin/login.js +++ b/src/modules/auth/components/Signin/login.js @@ -20,7 +20,7 @@ import styles from './login.css'; const RegisterTitle = ({ t }) => (
-

{t('Add account')}

+

{t('Add your account')}

{t('Enter your secret recovery phrase to manage your account.')}

diff --git a/src/modules/auth/components/SignupSuccessed/accountCreated.js b/src/modules/auth/components/SignupSuccessed/accountCreated.js index f2e0d17cc9..4ff4bf1c0e 100644 --- a/src/modules/auth/components/SignupSuccessed/accountCreated.js +++ b/src/modules/auth/components/SignupSuccessed/accountCreated.js @@ -12,16 +12,19 @@ import styles from './accountCreated.css'; const AccountCreated = ({ t }) => (
-

{t('Great! You have an account now')}

+

{t('Great! Your account is now created')}

+

+ {t('You can now add your account to Lisk Wallet by clicking on "Continue to dashboard", to be able to send and request tokens and much more.')} +

- {t('Continue to Add account')} + {t('Continue to dashboard')}
diff --git a/src/modules/auth/components/passphraseBackup/index.js b/src/modules/auth/components/passphraseBackup/index.js index ba514002f0..0ecd87c2c9 100644 --- a/src/modules/auth/components/passphraseBackup/index.js +++ b/src/modules/auth/components/passphraseBackup/index.js @@ -1,4 +1,3 @@ -// import QRCode from 'qrcode.react'; import React from 'react'; import { TertiaryButton } from 'src/theme/buttons'; import PassphraseRenderer from '@wallet/components/passphraseRenderer'; diff --git a/src/modules/blockchainApplication/connection/components/ConnectionProposal/index.js b/src/modules/blockchainApplication/connection/components/ConnectionProposal/index.js index 6ff84934f3..40a42cf631 100644 --- a/src/modules/blockchainApplication/connection/components/ConnectionProposal/index.js +++ b/src/modules/blockchainApplication/connection/components/ConnectionProposal/index.js @@ -35,8 +35,8 @@ const ConnectionProposal = ({ history }) => {
-

{t('Application pairing')}

-
{t('Input WalletConnect URI to pair with an application')}
+

{t('Connect wallet')}

+
{t('Paste WalletConnect URI to connect your application to Lisk Desktop.')}
@@ -45,7 +45,7 @@ const ConnectionProposal = ({ history }) => { onChange={e => setValue(e.target.value)} value={value} className={styles.input} - placeholder={t('Enter WalletConnect URI')} + placeholder={t('Enter connection URI')} /> {status.message ?? ''} diff --git a/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.js b/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.js index 555ece264c..d28dd90aba 100644 --- a/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.js +++ b/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.js @@ -20,7 +20,7 @@ const ConnectionStatus = ({ history }) => { [STATUS.SUCCESS]: t('Rejected the pairing request from {{name}}', { name }), [STATUS.FAILURE]: t('An error occurred while rejecting the pairing request from {{name}}', { name }), }, - default: t('An error occurred while responding to {{name}}', { name }), + default: t('Encountered an error while connecting to {{name}} application.', { name }), } const redirectToHome = () => { @@ -47,7 +47,7 @@ const ConnectionStatus = ({ history }) => {
{messages[action]?.[status] ?? messages.default}
- {t('Redirecting to dashboard...')} + {t('Returning to application...')}
diff --git a/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.test.js b/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.test.js index 1922dbb4e0..b58a9d6615 100644 --- a/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.test.js +++ b/src/modules/blockchainApplication/connection/components/ConnectionStatus/ConnectionStatus.test.js @@ -33,7 +33,7 @@ describe('ConnectionStatus', () => { it('Shows a message if events are not ready yet', () => { const wrapper = mountWithRouter(ConnectionStatus, props); - expect(wrapper.find('h6').text()).toEqual('An error occurred while responding to web app'); + expect(wrapper.find('h6').text()).toEqual('Encountered an error while connecting to web app application.'); }); it('Should mount correctly', () => { diff --git a/src/modules/blockchainApplication/connection/components/ConnectionSummary/index.js b/src/modules/blockchainApplication/connection/components/ConnectionSummary/index.js index 60891cfdba..f5f1b04f5c 100644 --- a/src/modules/blockchainApplication/connection/components/ConnectionSummary/index.js +++ b/src/modules/blockchainApplication/connection/components/ConnectionSummary/index.js @@ -69,7 +69,7 @@ const ConnectionSummary = ({ history }) => {
{
- {t('Permissions')} + {t('Site permissions')}
{ - {t('Reject')} + {t('Cancel')} { label={t('Information')} > - {t('{{name}} is requesting a signature from your Lisk wallet.', { name })} + {t('This transaction was initiated from another application for signature request.')} { it('Display the requesting app information', () => { setup(defaultContext); expect(screen.getByTestId('logo')).toHaveAttribute('src', 'http://example.com/icon.png'); - expect(screen.getByText('Sign transaction')).toBeTruthy(); + expect(screen.getByText('Signature request')).toBeTruthy(); expect(screen.getByText('test app')).toBeTruthy(); expect(screen.getByRole('link')).toHaveAttribute('href', 'http://example.com'); }); diff --git a/src/modules/blockchainApplication/connection/components/SessionManager/SessionRow.js b/src/modules/blockchainApplication/connection/components/SessionManager/SessionRow.js index 8a12a4fc14..647bea2d68 100644 --- a/src/modules/blockchainApplication/connection/components/SessionManager/SessionRow.js +++ b/src/modules/blockchainApplication/connection/components/SessionManager/SessionRow.js @@ -18,7 +18,7 @@ const SessionRow = ({ data, t, disconnect }) => ( {truncateAddress(data.topic)}
- (disconnect(data.topic))}>{t('Diconnect')} + (disconnect(data.topic))}>{t('Disconnect')}
); diff --git a/src/modules/blockchainApplication/connection/components/SessionManager/index.js b/src/modules/blockchainApplication/connection/components/SessionManager/index.js index c08b883845..e1665b72e1 100644 --- a/src/modules/blockchainApplication/connection/components/SessionManager/index.js +++ b/src/modules/blockchainApplication/connection/components/SessionManager/index.js @@ -35,7 +35,7 @@ const SessionManager = ({ history }) => { - {t('Bridge application')} + {t('Connect Wallet')} diff --git a/src/modules/blockchainApplication/explore/__fixtures__/mockBlockchainApp.js b/src/modules/blockchainApplication/explore/__fixtures__/mockBlockchainApp.js index aa3191b978..67df33e2af 100644 --- a/src/modules/blockchainApplication/explore/__fixtures__/mockBlockchainApp.js +++ b/src/modules/blockchainApplication/explore/__fixtures__/mockBlockchainApp.js @@ -1,6 +1,6 @@ /* Two mocks exist for blockchain explore. The mock here matches the response for * /blockchain/apps endpoint while the mock in the tests/fixtures folder - * matches the data here concatentated with the meta data + * matches the data here concatenated with the meta data */ /* eslint-disable import/prefer-default-export */ diff --git a/src/modules/blockchainApplication/explore/components/.gitkeep b/src/modules/blockchainApplication/explore/components/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.js b/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.js index 96e95648e7..e4232c7f8b 100644 --- a/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.js +++ b/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.js @@ -40,7 +40,7 @@ const BlockchainApplications = ({ id="blockchainApplications" /> diff --git a/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.test.js b/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.test.js index 677aafd3d4..62c2bf826a 100644 --- a/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.test.js +++ b/src/modules/blockchainApplication/explore/components/BlockchainApplications/BlockchainApplications.test.js @@ -70,7 +70,7 @@ describe('BlockchainApplications', () => { expect(screen.getByText('Status')).toBeTruthy(); expect(screen.getByText('LSK deposited')).toBeTruthy(); expect(screen.getByText('All applications')).toBeTruthy(); - expect(screen.getByText('Connections')).toBeTruthy(); + expect(screen.getByText('Wallet connections')).toBeTruthy(); expect(screen.getByText('Total Supply')).toBeTruthy(); expect(screen.getByText('Staked')).toBeTruthy(); diff --git a/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.js b/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.js index 0740bf7597..902e3407f0 100644 --- a/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.js +++ b/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.js @@ -22,11 +22,11 @@ const AddApplicationSuccess = ({ history }) => { />
{t('Perfect! Application has now been added')}
-
{t('You can see a list of your applications on the dashboard.')}
+
{t('You can see a list of your applications on the application dropdown.')}
 - {t('Continue to Dashboard')} + {t('Continue to dashboard')} diff --git a/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.test.js b/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.test.js index 754df4038c..d4bac2f7a7 100644 --- a/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.test.js +++ b/src/modules/blockchainApplication/manage/components/AddApplicationSuccess/AddApplicationSuccess.test.js @@ -13,7 +13,7 @@ describe('AddApplicationSuccess', () => { renderWithRouter(AddApplicationSuccess, props); expect(screen.getByText('Perfect! Application has now been added')).toBeTruthy(); - expect(screen.getByText('You can see a list of your applications on the dashboard.')).toBeTruthy(); + expect(screen.getByText('You can see a list of your applications on the application dropdown.')).toBeTruthy(); }); it('should reroute to the dashboard on success', () => { diff --git a/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.css b/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.css index cfda4fc39f..1eec6951a1 100644 --- a/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.css +++ b/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.css @@ -18,7 +18,7 @@ user-select: none; } -.appItemWrapper.termiated { +.appItemWrapper.terminated { & > .leftWrapper { opacity: 0.4; } @@ -38,7 +38,7 @@ .appItemWrapper:hover .deleteBtn, .appItemWrapper:hover .deleteBtnTooltip, -.appItemWrapper:hover .diabledDeleteBtn { +.appItemWrapper:hover .disabledDeleteBtn { display: flex; } @@ -71,7 +71,7 @@ } .deleteBtn, -.diabledDeleteBtn { +.disabledDeleteBtn { min-width: 30px; display: none; width: fit-content; @@ -82,7 +82,7 @@ margin-right: -6px; } -.diabledDeleteBtn { +.disabledDeleteBtn { opacity: 0.4; } diff --git a/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.js b/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.js index 2d94bf637d..eeecf73de3 100644 --- a/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.js +++ b/src/modules/blockchainApplication/manage/components/ApplicationManagementRow/ApplicationManagementRow.js @@ -45,7 +45,7 @@ const RightRowComponent = ({ content={( @@ -107,7 +107,7 @@ const ApplicationManagementRow = ({ return (
diff --git a/src/modules/blockchainApplication/manage/components/RemoveApplicationDetails/RemoveApplicationDetails.js b/src/modules/blockchainApplication/manage/components/RemoveApplicationDetails/RemoveApplicationDetails.js index 2bbff6c426..4e147455b9 100644 --- a/src/modules/blockchainApplication/manage/components/RemoveApplicationDetails/RemoveApplicationDetails.js +++ b/src/modules/blockchainApplication/manage/components/RemoveApplicationDetails/RemoveApplicationDetails.js @@ -25,7 +25,7 @@ const RemoveApplicationDetails = ({ }) => { const { t } = useTranslation(); const chainId = parseSearchParams(location.search)?.chainId; - // TODO: this needs to be reisntated when the set application flow is completed + // TODO: this needs to be reinstated when the set application flow is completed // because presently, there is no way to set current application on runtime // const { deleteApplicationByChainId } = useApplicationManagement(); @@ -66,7 +66,7 @@ const RemoveApplicationDetails = ({ ]; const handleRemoveApplication = () => { - // TODO: this needs to be reisntated when the set application flow is completed + // TODO: this needs to be reinstated when the set application flow is completed // because presently, there is no way to set current application on runtime // deleteApplicationByChainId(chainID); diff --git a/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.js b/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.js index 26c4d0f56b..729c82eb2a 100644 --- a/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.js +++ b/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.js @@ -26,7 +26,7 @@ const RemoveApplicationSuccess = ({ history, sharedData: { application } }) => { history.push('/dashboard'); }} > - {t('Continue to Dashboard')} + {t('Continue to dashboard')}
diff --git a/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.test.js b/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.test.js index a07547cc0c..436cfce754 100644 --- a/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.test.js +++ b/src/modules/blockchainApplication/manage/components/RemoveApplicationSuccess/RemoveApplicationSuccess.test.js @@ -25,7 +25,7 @@ describe('BlockchainApplicationDetails', () => { }); it('should navigate to the dashboard', () => { - fireEvent.click(screen.getByText('Continue to Dashboard')); + fireEvent.click(screen.getByText('Continue to dashboard')); expect(props.history.push).toHaveBeenCalledWith('/dashboard'); }); }); diff --git a/src/modules/blockchainApplication/manage/store/.gitkeep b/src/modules/blockchainApplication/manage/store/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/blockchainApplication/manage/utils/.gitkeep b/src/modules/blockchainApplication/manage/utils/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/bookmark/components/.gitkeep b/src/modules/bookmark/components/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/bookmark/components/BookmarksList/BookmarksList.test.js b/src/modules/bookmark/components/BookmarksList/BookmarksList.test.js index c24d1d7b0f..39872ac287 100644 --- a/src/modules/bookmark/components/BookmarksList/BookmarksList.test.js +++ b/src/modules/bookmark/components/BookmarksList/BookmarksList.test.js @@ -30,7 +30,7 @@ describe('BookmarksList', () => { expect(wrapper).not.toContainMatchingElement(EmptyState); }); - it('should render LSK bookmakrs ONLY', () => { + it('should render LSK bookmarks ONLY', () => { expect(wrapper).toContainMatchingElement('.bookmark-list-container'); expect(wrapper).toContainMatchingElements( props.limit, diff --git a/src/modules/bookmark/store/action.test.js b/src/modules/bookmark/store/action.test.js index 87f4c06e74..833ec8ba52 100644 --- a/src/modules/bookmark/store/action.test.js +++ b/src/modules/bookmark/store/action.test.js @@ -14,7 +14,7 @@ jest.mock('src/utils/localJSONStorage', () => ({ getFromStorage: jest.fn(), })); -describe('actions: boomarks', () => { +describe('actions: bookmarks', () => { const data = { wallet: { address: wallets.genesis.summary.address, diff --git a/src/modules/bookmark/store/middleware.test.js b/src/modules/bookmark/store/middleware.test.js index 3105f43d06..7eb9fee73b 100644 --- a/src/modules/bookmark/store/middleware.test.js +++ b/src/modules/bookmark/store/middleware.test.js @@ -29,7 +29,7 @@ describe('Middleware: Bookmarks', () => { data: { account: { ...accounts.genesis, title: 'genesis' } }, }, { type: actionTypes.bookmarkUpdated, - data: { account: { ...accounts.genesis, title: 'genesiss' } }, + data: { account: { ...accounts.genesis, title: 'genesis' } }, }, { type: actionTypes.bookmarkRemoved, data: { address: accounts.genesis.summary.address }, diff --git a/src/modules/common/components/calendar/calendarUtils.js b/src/modules/common/components/calendar/calendarUtils.js index 08f6d8b100..7dd5e66274 100644 --- a/src/modules/common/components/calendar/calendarUtils.js +++ b/src/modules/common/components/calendar/calendarUtils.js @@ -13,7 +13,7 @@ const setLocale = (locale) => { }; /** - * Returs if current Date is greater than min Date, based on amount passed on options + * Returns if current Date is greater than min Date, based on amount passed on options * @param {String|Date} current Value that should be validated * @param {String|Date} min Value to validate against * @param {Object} options Options to use when parsing date and amount to check. @@ -29,7 +29,7 @@ export const canGoToPrevious = (current, min, options = {}) => { }; /** - * Returs if current Date is less than min Date, based on amount passed on options + * Returns if current Date is less than min Date, based on amount passed on options * @param {String|Date} current Value that should be validated * @param {String|Date} max Value to validate against * @param {Object} options Options to use when parsing date and amount to check. @@ -45,7 +45,7 @@ export const canGoToNext = (current, max, options = {}) => { }; /** - * Returs true if date isn't between min and max, and should be disabled + * Returns true if date isn't between min and max, and should be disabled * @param {String|Date} date Date to check if should be disabled * @param {String|Date} min Date to check if greater than * @param {String|Date} max Date to check if less than diff --git a/src/modules/common/components/charts/chartOptions.test.js b/src/modules/common/components/charts/chartOptions.test.js index 146eff6f58..3c0082b172 100644 --- a/src/modules/common/components/charts/chartOptions.test.js +++ b/src/modules/common/components/charts/chartOptions.test.js @@ -35,7 +35,7 @@ describe('Chart Setting', () => { ], }; - const dougjnutData = { + const doughnutData = { labels: ['0 < 1', '1 < 100', '100 < 1K', '> 1K'], datasets: [ { @@ -57,9 +57,9 @@ describe('Chart Setting', () => { expect(options).toEqual(barOptions); }); - it('Data for DOUGGNUT chart', () => { - const options = doughnutChartData(dougjnutData); - const doughnutOptions = doughnutChartData(dougjnutData); + it('Data for DOUGHNUT chart', () => { + const options = doughnutChartData(doughnutData); + const doughnutOptions = doughnutChartData(doughnutData); expect(options).toEqual(doughnutOptions); }); }); @@ -84,7 +84,7 @@ describe('Chart Setting', () => { expect(Object.keys(options)).toEqual(expectedKeys); }); - it('Options for DOUGGNUT chart', () => { + it('Options for DOUGHNUT chart', () => { const options = doughnutChartOptions('light', extraOptions); const expectedKeys = Object.keys(merge(doughnutChartOptions(), baseOptions(), extraOptions)); expect(Object.keys(options)).toEqual(expectedKeys); diff --git a/src/modules/dpos/validator/components/DelegateSummary/DelegateSummary.js b/src/modules/dpos/validator/components/DelegateSummary/DelegateSummary.js index f56bf77410..0aad156887 100644 --- a/src/modules/dpos/validator/components/DelegateSummary/DelegateSummary.js +++ b/src/modules/dpos/validator/components/DelegateSummary/DelegateSummary.js @@ -37,7 +37,7 @@ const DelegateSummary = ({ delegate, status, weight }) => {
- {/* @Todo: the value of roundLength should be dynamically integrated from the useDposConstnats query hook which would be addressed in issue #4502 */} + {/* @Todo: the value of roundLength should be dynamically integrated from the useDposConstants query hook which would be addressed in issue #4502 */}

{t('This delegate is among the first 101 delegates in delegate weight ranking.')}

diff --git a/src/modules/dpos/validator/components/DelegatesMonitorView/delegates.css b/src/modules/dpos/validator/components/DelegatesMonitorView/delegates.css index 254b3ff876..5cc8935aae 100644 --- a/src/modules/dpos/validator/components/DelegatesMonitorView/delegates.css +++ b/src/modules/dpos/validator/components/DelegatesMonitorView/delegates.css @@ -180,7 +180,7 @@ } } -.statusToolip { +.statusTooltip { white-space: nowrap; } diff --git a/src/modules/dpos/validator/components/DelegatesTable/dataColumns.js b/src/modules/dpos/validator/components/DelegatesTable/dataColumns.js index d67bafab04..029b6510d3 100644 --- a/src/modules/dpos/validator/components/DelegatesTable/dataColumns.js +++ b/src/modules/dpos/validator/components/DelegatesTable/dataColumns.js @@ -161,7 +161,7 @@ export const RoundState = () => { size="maxContent" content={} > -

+

{roundStates[state]}

diff --git a/src/modules/dpos/validator/components/delegateProfile/delegateProfile.test.js b/src/modules/dpos/validator/components/delegateProfile/delegateProfile.test.js index 92eddaad26..cb0238f4bc 100644 --- a/src/modules/dpos/validator/components/delegateProfile/delegateProfile.test.js +++ b/src/modules/dpos/validator/components/delegateProfile/delegateProfile.test.js @@ -116,7 +116,7 @@ describe('Delegate Profile', () => { ).toBeTruthy(); }); - it('Should render stanby delegate profile details', () => { + it('Should render standby delegate profile details', () => { useDelegates.mockReturnValue({ data: { ...mockDelegates, diff --git a/src/modules/dpos/validator/components/delegateProfile/delegateVotesView.test.js b/src/modules/dpos/validator/components/delegateProfile/delegateVotesView.test.js index 66b516da9a..c25c0e9122 100644 --- a/src/modules/dpos/validator/components/delegateProfile/delegateVotesView.test.js +++ b/src/modules/dpos/validator/components/delegateProfile/delegateVotesView.test.js @@ -19,7 +19,7 @@ describe('Delegate votes view', () => { }; useFilter.mockReturnValue({ - filters: { adress: props.address }, + filters: { address: props.address }, applyFilters: mockApplyFilters, clearFilters: mockClearFilters, }); @@ -35,7 +35,7 @@ describe('Delegate votes view', () => { it('Should filter voters by search value', () => { useFilter.mockReturnValue({ - filters: { adress: props.address }, + filters: { address: props.address }, applyFilters: mockApplyFilters, clearFilters: mockClearFilters, }); @@ -51,7 +51,7 @@ describe('Delegate votes view', () => { it('Should not render search input', () => { useFilter.mockReturnValue({ - filters: { adress: props.address }, + filters: { address: props.address }, applyFilters: mockApplyFilters, clearFilters: mockClearFilters, }); diff --git a/src/modules/legacy/components/Status/status.test.js b/src/modules/legacy/components/Status/status.test.js index a57e6e109c..6996c4dbe8 100644 --- a/src/modules/legacy/components/Status/status.test.js +++ b/src/modules/legacy/components/Status/status.test.js @@ -84,7 +84,7 @@ describe('Status', () => { expect(wrapper.find(TxBroadcaster).props()).toMatchObject({ illustration: 'default', status: { code: 'BROADCAST_ERROR', message: JSON.stringify({ message: 'error:test' }) }, - title: 'Transaction failed', + title: 'Reclaim LSK tokens failed', className: 'content', }); }); @@ -104,7 +104,7 @@ describe('Status', () => { expect(wrapper.find(TxBroadcaster).props()).toMatchObject({ illustration: 'default', status: { code: 'BROADCAST_SUCCESS' }, - title: 'Balance reclaimed successfully', + title: 'Reclaimed LSK tokens', className: 'content', }); }); diff --git a/src/modules/legacy/components/Status/statusMessages.js b/src/modules/legacy/components/Status/statusMessages.js index 12c3ca55b0..1fdef21fda 100644 --- a/src/modules/legacy/components/Status/statusMessages.js +++ b/src/modules/legacy/components/Status/statusMessages.js @@ -5,8 +5,14 @@ import { txStatusTypes } from '@transaction/configuration/txStatus'; const reclaimBalanceMessages = t => ({ ...statusMessages(t), [txStatusTypes.broadcastSuccess]: { - title: t('Balance reclaimed successfully'), - message: t('Your legacy balance was deposited to your account.'), + title: t('Reclaimed LSK tokens'), + message: t('Your tokens will be deposited to your account.'), + }, + [txStatusTypes.broadcastError]: { + title: t('Reclaim LSK tokens failed'), + message: t( + 'Your LSK tokens could not be reclaimed, you can try again or report to us via email' + ), }, }); diff --git a/src/modules/message/components/signMessageView/index.js b/src/modules/message/components/signMessageView/index.js index f19d0c0e58..5009b1f8cf 100644 --- a/src/modules/message/components/signMessageView/index.js +++ b/src/modules/message/components/signMessageView/index.js @@ -26,7 +26,7 @@ const signMessageView = ({ account, t, history, signMessage }) => { {multiStepPosition !== 1 && ( -

{t('Sign message')}

+

{multiStepPosition === 2 ? t('Signed message') : t('Sign message')}

 )} diff --git a/src/modules/message/components/signedMessage/index.js b/src/modules/message/components/signedMessage/index.js index ea8bba84c9..e03050a41c 100644 --- a/src/modules/message/components/signedMessage/index.js +++ b/src/modules/message/components/signedMessage/index.js @@ -40,7 +40,7 @@ const Success = ({ }} className={`${styles.button} go-back`} > - {t('Go back')} + {t('Back')}

{isCorrect - ? t('The signature is correct') - : t('The signature is incorrect')} + ? t('Signature is correct') + : t('Signature is incorrect')}

diff --git a/src/modules/message/components/verifyMessageView/index.test.js b/src/modules/message/components/verifyMessageView/index.test.js index 9dc85b3489..a60579a27b 100644 --- a/src/modules/message/components/verifyMessageView/index.test.js +++ b/src/modules/message/components/verifyMessageView/index.test.js @@ -55,7 +55,7 @@ ${signature} wrapper.find('.publicKey input').simulate('change', { target: { value: publicKey, name: 'publicKey' } }); wrapper.find('.signature input').simulate('change', { target: { value: signature, name: 'signature' } }); wrapper.find('.continue button').simulate('click'); - expect(wrapper.find('h1')).toIncludeText('The signature is correct'); + expect(wrapper.find('h1')).toIncludeText('Signature is correct'); }); it('should allow to go back and keep value of all inputs', () => { @@ -64,7 +64,7 @@ ${signature} wrapper.find('.publicKey input').simulate('change', { target: { value: publicKey, name: 'publicKey' } }); wrapper.find('.signature input').simulate('change', { target: { value: signature, name: 'signature' } }); wrapper.find('.continue button').simulate('click'); - expect(wrapper.find('h1')).toIncludeText('The signature is correct'); + expect(wrapper.find('h1')).toIncludeText('Signature is correct'); }); it('should allow to verify invalid inputs', () => { @@ -73,7 +73,7 @@ ${signature} wrapper.find('.publicKey input').simulate('change', { target: { value: publicKey, name: 'publicKey' } }); wrapper.find('.signature input').simulate('change', { target: { value: signature.substr(2), name: 'signature' } }); wrapper.find('.continue button').simulate('click'); - expect(wrapper.find('h1')).toIncludeText('The signature is incorrect'); + expect(wrapper.find('h1')).toIncludeText('Signature is incorrect'); }); it('should recognize invalid publicKey', () => { @@ -94,7 +94,7 @@ ${signature} wrapper.find('.signedMessage textarea').simulate('change', { target: { value: signedMessage, name: 'signedMessage' } }); wrapper.find('.continue button').simulate('click'); - expect(wrapper.find('h1')).toIncludeText('The signature is correct'); + expect(wrapper.find('h1')).toIncludeText('Signature is correct'); }); it('should allow to verify a invalid message with the textarea view', () => { @@ -103,6 +103,6 @@ ${signature} }); wrapper.find('.continue button').simulate('click'); - expect(wrapper.find('h1')).toIncludeText('The signature is incorrect'); + expect(wrapper.find('h1')).toIncludeText('Signature is incorrect'); }); }); diff --git a/src/modules/settings/components/discreetModeToggle/discreetModeToggle.js b/src/modules/settings/components/discreetModeToggle/discreetModeToggle.js index b05770e280..676122edce 100644 --- a/src/modules/settings/components/discreetModeToggle/discreetModeToggle.js +++ b/src/modules/settings/components/discreetModeToggle/discreetModeToggle.js @@ -13,7 +13,7 @@ const DiscreetModeToggle = ({ className, isDiscreetMode, settingsUpdated, t }) = settingsUpdated({ discreetMode: !isDiscreetMode }); }} /> - {t('Enable discreet mode when signed in (optional)')} + {t('Enable discreet mode (optional)')} ); diff --git a/src/modules/settings/components/discreetModeToggle/discreetModeToggle.test.js b/src/modules/settings/components/discreetModeToggle/discreetModeToggle.test.js index c080fbd142..df55561f18 100644 --- a/src/modules/settings/components/discreetModeToggle/discreetModeToggle.test.js +++ b/src/modules/settings/components/discreetModeToggle/discreetModeToggle.test.js @@ -21,7 +21,7 @@ describe('DiscreetModeToggle Component', () => { expect(wrapper).toContainMatchingElements(1, 'label'); expect(wrapper).toContainMatchingElements(1, 'span'); expect(wrapper.find('label')).toHaveClassName('toggle'); - expect(wrapper.find('span')).toHaveText('Enable discreet mode when signed in (optional)'); + expect(wrapper.find('span')).toHaveText('Enable discreet mode (optional)'); wrapper.find('.discreetMode').simulate('change', true); expect(props.settingsUpdated).toBeCalledWith({ discreetMode: true }); wrapper.setProps({ isDiscreetMode: true }); @@ -33,7 +33,7 @@ describe('DiscreetModeToggle Component', () => { expect(wrapper).toContainMatchingElements(1, 'label'); expect(wrapper).toContainMatchingElements(1, 'span'); expect(wrapper.find('label')).toHaveClassName('toggle'); - expect(wrapper.find('span')).toHaveText('Enable discreet mode when signed in (optional)'); + expect(wrapper.find('span')).toHaveText('Enable discreet mode (optional)'); wrapper.find('.discreetMode').simulate('change', true); expect(props.settingsUpdated).toBeCalledWith({ discreetMode: false }); wrapper.setProps({ isDiscreetMode: false }); diff --git a/src/modules/token/fungible/components/SendForm/SendForm.js b/src/modules/token/fungible/components/SendForm/SendForm.js index 36fc1d330a..979937c94f 100644 --- a/src/modules/token/fungible/components/SendForm/SendForm.js +++ b/src/modules/token/fungible/components/SendForm/SendForm.js @@ -177,7 +177,7 @@ const SendForm = (props) => {
{
{ name="amount" />
- {t('Recipient Address')} + {t('Recipient address')} !item.disabled)} recipient={recipient} diff --git a/src/modules/token/fungible/components/SendStatus/status.test.js b/src/modules/token/fungible/components/SendStatus/status.test.js index a6b0be1448..ea4d5eb842 100644 --- a/src/modules/token/fungible/components/SendStatus/status.test.js +++ b/src/modules/token/fungible/components/SendStatus/status.test.js @@ -141,7 +141,7 @@ describe('unlock transaction Status', () => { expect(wrapper.find(TxBroadcaster).props()).toMatchObject({ illustration: 'default', status: { code: 'BROADCAST_SUCCESS' }, - message: 'Your transaction has been submitted and will be confirmed in a few moments.', + message: 'Your transaction is submitted to network, you can now track the status of this transaction in your wallet.', title: 'Transaction submitted', }); expect(wrapper.find(DialogLink).props()).toMatchObject({ diff --git a/src/modules/transaction/components/RequestedTxStatus/RequestedTxStatus.test.js b/src/modules/transaction/components/RequestedTxStatus/RequestedTxStatus.test.js index aae5cd40da..9f97d7a6c8 100644 --- a/src/modules/transaction/components/RequestedTxStatus/RequestedTxStatus.test.js +++ b/src/modules/transaction/components/RequestedTxStatus/RequestedTxStatus.test.js @@ -65,7 +65,7 @@ describe('TransactionResult RequestedTxStatus', () => { , ); - fireEvent.click(screen.getByText('Copy and send to the application')); + fireEvent.click(screen.getByText('Copy and return to application')); expect(copyToClipboard).toHaveBeenCalledWith( JSON.stringify(toTransactionJSON(props.transactions.signedTransaction, context.events[0].meta.params.request.params.schema)) ); diff --git a/src/modules/transaction/components/RequestedTxStatus/index.js b/src/modules/transaction/components/RequestedTxStatus/index.js index 5b2fd101ce..f94f9b7172 100644 --- a/src/modules/transaction/components/RequestedTxStatus/index.js +++ b/src/modules/transaction/components/RequestedTxStatus/index.js @@ -24,7 +24,7 @@ export const SuccessActions = ({ onClick, t, copied }) => ( { copied ? t('Copied') - : t('Copy and send to the application') + : t('Copy and return to application') } diff --git a/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.js b/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.js index bad78b15d2..c2ee569016 100644 --- a/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.js +++ b/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.js @@ -1,4 +1,5 @@ import React, { useEffect } from 'react'; +import { useTranslation } from 'react-i18next'; import { TertiaryButton } from 'src/theme/buttons'; import { useCommandSchema } from '@network/hooks'; import Icon from 'src/theme/Icon'; @@ -28,6 +29,7 @@ const TxSignatureCollector = ({ }) => { const [sender] = useCurrentAccount(); const { moduleCommandSchemas } = useCommandSchema(); + const { t } = useTranslation(); // here, we want to get the auth account details of the user presently wanting to sign the transaction const { data: account, isLoading: isGettingAuthData } = useAuth({ @@ -128,7 +130,7 @@ const TxSignatureCollector = ({ diff --git a/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.test.js b/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.test.js index 86261fab88..9b1a82091f 100644 --- a/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.test.js +++ b/src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.test.js @@ -93,9 +93,9 @@ describe('TxSignatureCollector', () => { it('should render password input fit not used with HW', () => { render(); - expect(screen.getByText('Enter your password')).toBeInTheDocument(); + expect(screen.getByText('Enter your account password')).toBeInTheDocument(); expect( - screen.getByText('Please provide your device password to sign a transaction.') + screen.getByText('Please enter your account password to sign this transaction.') ).toBeInTheDocument(); expect(screen.getByText(mockCurrentAccount.metadata.name)).toBeInTheDocument(); expect(screen.getByText(mockCurrentAccount.metadata.address)).toBeInTheDocument(); diff --git a/src/modules/transaction/configuration/statusConfig.js b/src/modules/transaction/configuration/statusConfig.js index 8b16b1fc46..5bcfc9a10a 100644 --- a/src/modules/transaction/configuration/statusConfig.js +++ b/src/modules/transaction/configuration/statusConfig.js @@ -27,7 +27,7 @@ export const statusMessages = (t) => ({ }, [txStatusTypes.broadcastSuccess]: { title: t('Transaction submitted'), - message: t('Your transaction has been submitted and will be confirmed in a few moments.'), + message: t('Your transaction is submitted to network, you can now track the status of this transaction in your wallet.'), }, [txStatusTypes.signatureError]: { title: t('Transaction failed'), diff --git a/src/modules/wallet/components/passphraseRenderer/index.js b/src/modules/wallet/components/passphraseRenderer/index.js index a1521ff32d..ac55afc857 100644 --- a/src/modules/wallet/components/passphraseRenderer/index.js +++ b/src/modules/wallet/components/passphraseRenderer/index.js @@ -150,7 +150,7 @@ class PassphraseRenderer extends React.Component {

{t('Secret recovery phrase')}

{subheader && (

- {t('Please carefully write down these 12 words and store them in a safe place.')} + {t('Please write down these 12 words carefully, and store them in a safe place.')}

)} diff --git a/tests/cypress/features/verifyMessage.feature b/tests/cypress/features/verifyMessage.feature index bc1002cefc..05c2c76254 100644 --- a/tests/cypress/features/verifyMessage.feature +++ b/tests/cypress/features/verifyMessage.feature @@ -21,7 +21,7 @@ Feature: Verify Message # When I fill invalid_text in verifyMessageTextArea field # And I click on continueBtn # And I wait 2 seconds - # Then I see this title: The signature is incorrect + # Then I see this title: Signature is incorrect # @basic # Scenario: Verify the integrity of a signed message in input fields view @@ -34,7 +34,7 @@ Feature: Verify Message # When I fill 09392ac34e257b6cdb9bd4a73fc3901a073061c17b71ee4d4500fd600044eabd901b27584d59946f26a869a1e29ccdc87209272db545c02e43b4c083242ffc0d in verifySignatureInput field # And I click on continueBtn # And I wait 2 seconds - # Then I see this title: The signature is correct + # Then I see this title: Signature is correct # @basic # Scenario: Verify the integrity of a tampered message in input fields view @@ -47,4 +47,4 @@ Feature: Verify Message # When I fill 112233abcde in verifySignatureInput field # And I click on continueBtn # And I wait 2 seconds - # Then I see this title: The signature is incorrect + # Then I see this title: Signature is incorrect diff --git a/tests/cypress/features/verifyMessage/verifyMessage.js b/tests/cypress/features/verifyMessage/verifyMessage.js index b9e02ee19f..f24a4d5e65 100644 --- a/tests/cypress/features/verifyMessage/verifyMessage.js +++ b/tests/cypress/features/verifyMessage/verifyMessage.js @@ -7,7 +7,7 @@ Then(/^I verify signed message in (\w+)$/, function (field) { win.navigator.clipboard.readText().then((clipboardValue) => { cy.get(ss[field]).type(clipboardValue) cy.get(ss.continueBtn).eq(0).click(); - cy.get(ss.app).contains('The signature is correct'); + cy.get(ss.app).contains('Signature is correct'); }); });