Merge branch 'release-1.27.1'

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lisk-desktop",
-  "version": "1.27.0",
+  "version": "1.27.1-beta.0",
   "productName": "Lisk",
   "description": "Lisk",
   "main": "./build/main.js",

app/src/menu.js

@@ -124,6 +124,10 @@ const menu = {
             label: i18n.t('Discord'),
             click: menu.onClickLink.bind(null, electron, 'https://discord.gg/CngsY6D'),
           },
+          {
+            label: i18n.t('Provide Feedback'),
+            click: menu.onClickLink.bind(null, electron, 'https://lisk.io/contact/i-want-provide-feedback-about-lisk-product/form'),
+          },
           {
             label: i18n.t('Lisk Explorer'),
             click: menu.onClickLink.bind(null, electron, 'https://explorer.lisk.io'),

app/src/modules/autoUpdater.js

@@ -73,7 +73,8 @@ export default ({ // eslint-disable-line max-statements
       title: i18n.t('Update download finished'),
       buttons: [i18n.t('Restart now'), i18n.t('Later')],
       message: i18n.t('Updates downloaded, application has to be restarted to apply the updates.'),
-    }, (buttonIndex) => {
+    }).then((result) => {
+      const buttonIndex = result.response;
       if (buttonIndex === 0) {
         autoUpdater.quitAndInstall();
       }

app/src/modules/autoUpdater.test.js

@@ -48,20 +48,25 @@ describe('autoUpdater', () => {
   };
 
   beforeEach(() => {
-    callbacks = {};
+    const quitAndInstall = spy();
+    callbacks = {
+      clickDialogButton: (buttonIndex) => {
+        if (buttonIndex === 0) {
+          quitAndInstall();
+        }
+      },
+    };
     params = {
       autoUpdater: {
         checkForUpdates: spy(),
         on: (name, callback) => {
           callbacks[name] = callback;
         },
-        quitAndInstall: spy(),
+        quitAndInstall,
         downloadUpdate: spy(),
       },
       dialog: {
-        showMessageBox: (options, callback) => {
-          callbacks.dialog = callback;
-        },
+        showMessageBox: () => new Promise(resolve => resolve()),
         showErrorBox: spy(),
       },
       win: {
@@ -140,15 +145,15 @@ describe('autoUpdater', () => {
   it('should install update once downloaded and "Restart now" button pressed', () => {
     autoUpdater(params);
     callbacks['update-downloaded']({ version });
-    callbacks.dialog(0);
+    callbacks.clickDialogButton(0);
 
     expect(params.autoUpdater.quitAndInstall).to.have.been.calledWithExactly();
   });
 
   it('should not install update when "Later" was pressed', () => {
     autoUpdater(params);
     callbacks['update-downloaded']({ releaseNotes, version });
-    callbacks.dialog(1);
+    callbacks.clickDialogButton(1);
 
     expect(params.autoUpdater.quitAndInstall).to.not.have.been.calledWith();
   });

i18n/locales/en/common.json

@@ -52,6 +52,7 @@
   "At this moment there is a connection problem with the tweets feed": "At this moment there is a connection problem with the tweets feed",
   "Auto Logout": "Auto Logout",
   "Awaiting slot": "Awaiting slot",
+  "BTC Address": "BTC Address",
   "Back": "Back",
   "Back to Voting Table": "Back to Voting Table",
   "Balance": "Balance",
@@ -66,7 +67,6 @@
   "Blocks forged": "Blocks forged",
   "Blocks overview": "Blocks overview",
   "Blog": "Blog",
-  "Bookmarked": "Bookmarked",
   "Bookmarks": "Bookmarks",
   "By enabling it, you will be able to manage your BTC inside the application.": "By enabling it, you will be able to manage your BTC inside the application.",
   "By voting you decide who is trusted to verify transactions and maintain the Lisk network, whilst collecting the rewards for doing so.": "By voting you decide who is trusted to verify transactions and maintain the Lisk network, whilst collecting the rewards for doing so.",
@@ -93,11 +93,14 @@
   "Connected to:": "Connected to:",
   "Connection re-established": "Connection re-established",
   "Continue": "Continue",
-  "Continue to Dashboard": "Continue to Dashboard",
   "Continue to sign in": "Continue to sign in",
+  "Copied": "Copied",
   "Copied!": "Copied!",
   "Copy": "Copy",
+  "Copy address": "Copy address",
   "Copy entire passphrase": "Copy entire passphrase",
+  "Copy link": "Copy link",
+  "Copy the address or scan the QR code, to easily request BTC from Lisk or Lisk Mobile users.": "Copy the address or scan the QR code, to easily request BTC from Lisk or Lisk Mobile users.",
   "Copy to clipboard": "Copy to clipboard",
   "Count": "Count",
   "Country": "Country",
@@ -110,7 +113,6 @@
   "Custom Node": "Custom Node",
   "Cut": "Cut",
   "DD MMM YYYY": "DD MMM YYYY",
-  "DD MMM YYYY, hh:mm A": "DD MMM YYYY, hh:mm A",
   "DD.MM.YY": "DD.MM.YY",
   "Dark Mode": "Dark Mode",
   "Dashboard": "Dashboard",
@@ -183,7 +185,6 @@
   "Go back": "Go back",
   "Go to Dashboard": "Go to Dashboard",
   "Go to confirmation": "Go to confirmation",
-  "Go to settings": "Go to settings",
   "Got it, thanks!": "Got it, thanks!",
   "Height": "Height",
   "Height distribution": "Height distribution",
@@ -328,6 +329,7 @@
   "Processing Speed": "Processing Speed",
   "Processing...": "Processing...",
   "Productivity": "Productivity",
+  "Provide Feedback": "Provide Feedback",
   "Provide a correct amount of {{token}}": "Provide a correct amount of {{token}}",
   "Provide a correct wallet address or a name of a bookmarked account": "Provide a correct wallet address or a name of a bookmarked account",
   "Provided amount is higher than your current balance.": "Provided amount is higher than your current balance.",
@@ -350,12 +352,15 @@
   "Reload": "Reload",
   "Reload the page": "Reload the page",
   "Remind me later": "Remind me later",
+  "Remove": "Remove",
   "Remove bookmark": "Remove bookmark",
   "Removed": "Removed",
   "Removed votes": "Removed votes",
   "Report the error via E-Mail": "Report the error via E-Mail",
+  "Request BTC": "Request BTC",
+  "Request LSK": "Request LSK",
+  "Requested amount": "Requested amount",
   "Required": "Required",
-  "Reset timer & continue": "Reset timer & continue",
   "Restart now": "Restart now",
   "Retry": "Retry",
   "Reward": "Reward",
@@ -366,6 +371,7 @@
   "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 passphrase": "Save your passphrase",
   "Scan address": "Scan address",
+  "Search": "Search",
   "Search by name or address": "Search by name or address",
   "Search within the network...": "Search within the network...",
   "Second passphrase": "Second passphrase",
@@ -384,20 +390,20 @@
   "Send {{token}}": "Send {{token}}",
   "Send {{token}} here": "Send {{token}} here",
   "Sender": "Sender",
-  "Session timeout": "Session timeout",
+  "Session timeout": "Your session was timed out after 10 minutes of no network activity. Please sign in to continue using your account.",
   "Settings": "Settings",
   "Settings saved!": "Settings saved!",
   "Show": "Show",
   "Sign Message": "Sign Message",
   "Sign a message": "Sign a message",
-  "Sign back in": "Sign back in",
   "Sign in": "Sign in",
   "Sign in to view recent transactions": "Sign in to view recent transactions",
   "Sign in with a Passphrase": "Sign in with a Passphrase",
   "Sign in with a hardware wallet": "Sign in with a hardware wallet",
   "Sign out": "Sign out",
   "Signature": "Signature",
   "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",
   "Size": "Size",
   "Something went wrong with the registration. Please try again below!": "Something went wrong with the registration. Please try again below!",
   "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.",
@@ -437,7 +443,6 @@
   "This helps to keep the network fair, open and honest.": "This helps to keep the network fair, open and honest.",
   "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.",
   "Time until next forging slot of a delegate.": "Time until next forging slot of a delegate.",
-  "Timeout soon": "Timeout soon",
   "To": "To",
   "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.",
   "Toggle full screen": "Toggle full screen",
@@ -471,6 +476,7 @@
   "Update download finished": "Update download finished",
   "Update now": "Update now",
   "Updates downloaded, application has to be restarted to apply the updates.": "Updates downloaded, application has to be restarted to apply the updates.",
+  "Use the sharing link to easily request any amount of LSK from Lisk users.": "Use the sharing link to easily request any amount of LSK from Lisk users.",
   "Use this tool to verify the validity of a signed message. This allows you to ensure that the person who signed the message was in fact the account owner": "Use this tool to verify the validity of a signed message. This allows you to ensure that the person who signed the message was in fact the account owner",
   "Verify Message": "Verify Message",
   "Verify address": "Verify address",
@@ -526,22 +532,19 @@
   "You have cancelled the transaction on your hardware wallet.": "You have cancelled the transaction on your hardware wallet.",
   "You have cancelled the transaction on your hardware wallet. You can either continue or retry.": "You have cancelled the transaction on your hardware wallet. You can either continue or retry.",
   "You will be notified when your transaction is confirmed.": "You will be notified when your transaction is confirmed.",
-  "You will be signed out in a minute due to no network activity. You can turn off Auto-Logout in the settings.": "You will be signed out in a minute due to no network activity. You can turn off Auto-Logout in the settings.",
   "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 just received {{amount}} {{token}} {{message}}": "Your account just received {{amount}} {{token}} {{message}}",
   "Your message": "Your message",
   "Your nickname": "Your nickname",
-  "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk or sign back in to access everything.": "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk or sign back in to access everything.",
   "Your voice matters": "Your voice matters",
   "You’ll see it in Delegates and it will be confirmed in a matter of minutes.": "You’ll see it in Delegates and it will be confirmed in a matter of minutes.",
-  "[Today], hh:mm A": "[Today], hh:mm A",
   "[Tomorrow], hh:mm A": "[Tomorrow], hh:mm A",
-  "[Yesterday], hh:mm A": "[Yesterday], hh:mm A",
   "block": "block",
   "forged": "forged",
   "from": "from",
+  "hh:mm A": "hh:mm A",
   "i.e. {{value1}} or {{value2}}": "i.e. {{value1}} or {{value2}}",
   "i.e. {{value}}": "i.e. {{value}}",
   "ie. 192.168.0.1": "ie. 192.168.0.1",

jest.config.js

@@ -44,6 +44,7 @@ module.exports = {
     'app/src/modules/win.js',
     'app/src/modules/localeHandler.js',
     'app/src/modules/storage.js',
+    'src/utils/testHelpers.js',
     'src/constants/',
     'src/i18n-scanner.js',
     'src/main.js',
@@ -73,6 +74,7 @@ module.exports = {
     'src/components/shared/navigationBars/topBar/topBar.js',
     'src/components/shared/navigationBars/sideBar/index.js',
     'src/components/shared/navigationBars/topBar/navigationButtons.js',
+    'src/components/shared/newReleaseDialog/index.js',
     'src/components/toolbox/pageLayout/index.js',
     'src/components/shared/formattedNumber/stories.js',
     'src/components/shared/header/signInHeader/signInHeader.js',