Skip to content

Commit

Permalink
Merge pull request #3448 from LiskHQ/3430-merge-master-into-development
Browse files Browse the repository at this point in the history
  • Loading branch information
usama authored Apr 8, 2021
2 parents 23e55af + 96f9342 commit 53f72c6
Show file tree
Hide file tree
Showing 61 changed files with 1,502 additions and 939 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
booleanParam(name: 'SKIP_PERCY', defaultValue: false, description: 'Skip running percy.')
string(name: 'LISK_CORE_VERSION', defaultValue: 'release/3.0.0-beta.1', description: 'Use lisk-core branch.', )
string(name: 'LISK_CORE_IMAGE_VERSION', defaultValue: '3.0.0-beta.1-a7842d112d5136d9462501763c4cb2895096e900', description: 'Use lisk-core docker image.', )
string(name: 'LISK_SERVICE_VERSION', defaultValue: 'v0.2.0-rc.0', description: 'Use lisk-service branch.', )
string(name: 'LISK_SERVICE_VERSION', defaultValue: 'v0.2.0', description: 'Use lisk-service branch.', )
}
stages {
stage('Install npm dependencies') {
Expand Down Expand Up @@ -52,7 +52,7 @@ pipeline {
}
}
stage('Deploy build') {
agent { node { label 'master-01' } }
agent { node { label 'explorer-www' } }
steps {
unstash 'build'
sh '''
Expand Down Expand Up @@ -183,7 +183,7 @@ EOF
export CYPRESS_serviceUrl=http://127.0.0.1:9901
set +e
set -o pipefail
npm run cypress:run |tee cypress.log
npm run cypress:run -- --record |tee cypress.log
ret=$?
# this is to save on cypress credits
Expand Down
11 changes: 7 additions & 4 deletions i18n/locales/en/common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,9 @@
"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 order to see your recent transactions you need to sign in.": "In order to see your recent transactions you need to sign in.",
"In order to use this Lisk feature you need to sign in to your Lisk account.": "In order to use this Lisk feature you need to sign in to your Lisk account.",
"Initialize account": "Initialize account",
"Initialization summary ": "Initialization summary ",
"Initialize": "Initialize",
"Initialize your account": "Initialize your account",
"Input view": "Input view",
"Input your vote weight. This value shows how much you trust in this delegate. You can’t use these tokens until you undo your vote.": "Input your vote weight. This value shows how much you trust in this delegate. You can’t use these tokens until you undo your vote.",
"Insert label": "Insert label",
Expand All @@ -210,6 +212,7 @@
"Invalid address or public key": "Invalid address or public key",
"Invalid amount": "Invalid amount",
"Invalid dates": "Invalid dates",
"It takes 1 minute of your time and 0.1 LSK to protect your account.": "It takes 1 minute of your time and 0.1 LSK to protect your account.",
"Keep it safe as it is the only way to access your wallet.": "Keep it safe as it is the only way to access your wallet.",
"Keep up-to-date with announcements from the Lisk Foundation. Check what network delegates have been up to with dedicated profile pages.": "Keep up-to-date with announcements from the Lisk Foundation. Check what network delegates have been up to with dedicated profile pages.",
"LSK received": "LSK received",
Expand Down Expand Up @@ -301,7 +304,7 @@
"Pending": "Pending",
"Pending...": "Pending...",
"Percentage of successfully forged blocks in relation to all blocks (forged and missed).": "Percentage of successfully forged blocks in relation to all blocks (forged and missed).",
"Perfect! You're all set": "Perfect! You're all set",
"Perfect! Almost done": "Perfect! Almost done",
"Performance": "Performance",
"Personalize each transaction with a custom message. Look up its value in a fiat currency of your choice.": "Personalize each transaction with a custom message. Look up its value in a fiat currency of your choice.",
"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.",
Expand Down Expand Up @@ -491,7 +494,6 @@
"Wallet address:": "Wallet address:",
"Wallet details": "Wallet details",
"Watched": "Watched",
"We advise all users to initialize their account as soon as possible. To do so, simply make one outgoing transaction.": "We advise all users to initialize their account as soon as possible. To do so, simply make one outgoing transaction.",
"We would like to request permission for collecting anonymous data in order to improve our UI products. The data will be stored in our servers however, it will not include sensitive information related to your Lisk Account.": "We would like to request permission for collecting anonymous data in order to improve our UI products. The data will be stored in our servers however, it will not include sensitive information related to your Lisk Account.",
"What is a Lisk ID?": "What is a Lisk ID?",
"What is your second passphrase?": "What is your second passphrase?",
Expand All @@ -508,8 +510,8 @@
"You are disconnected": "You are disconnected",
"You can also download, print and store safely your passphrase.": "You can also download, print and store safely your passphrase.",
"You can increase or decrease your vote amount, or remove your vote from this delegate.": "You can increase or decrease your vote amount, or remove your vote from this delegate.",
"You can learn more": "You can learn more",
"You can learn more in our": "You can learn more in our",
"You can now start sending and receiving LSK": "You can now start sending and receiving LSK",
"You can only vote in multiplies of 10 LSK.": "You can only vote in multiplies of 10 LSK.",
"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't vote for more than 10 delegates.": "You can't vote for more than 10 delegates.",
Expand All @@ -523,6 +525,7 @@
"You'll find it in your Wallet and it will be confirmed in a matter of minutes.": "You'll find it in your Wallet and it will be confirmed in a matter of minutes.",
"You've received {{value}} LSK.": "You've received {{value}} LSK.",
"Your Lisk ID is how you recognize and interact with your unique Lisk account, think of it as your email.": "Your Lisk ID is how you recognize and interact with your unique Lisk account, think of it as your email.",
"Your account is not safe until you initialize it.": "Your account is not safe until you initialize it.",
"Your account just received {{amount}} {{token}} {{message}}": "Your account just received {{amount}} {{token}} {{message}}",
"Your message": "Your message",
"Your nickname": "Your nickname",
Expand Down
Loading

0 comments on commit 53f72c6

Please sign in to comment.