Merge patch 2.0.1 into master (#3754)

* Fix bugs for 2.0.1 patch release - Closes #3739, #3742, #3744, #3735 (#3747) * Fix undefined passphrase when extracting BTC address * Fix undefined wrong token at send BTC amount validation * Add Enable BTC setting when logged out * Increase balance required for reclaim * Remove unused import * Fix grammatical mistake * Remove locale tag * Add dpos null check * Load delegate data when explorer account change (#3749) * Fix 0 amount tx notification - Closes #3571 (#3752) * Add amount condition before window.Notification * Add amount condition * Bump version 2.0.1 Co-authored-by: Oliver Beddows <oliver@lightcurve.io>
LiskHQ · Aug 30, 2021 · 8edbd03 · 8edbd03
1 parent a019eae
commit 8edbd03
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 26 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lisk-desktop",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "productName": "Lisk",
   "description": "Lisk",
   "main": "./build/main.js",

diff --git a/i18n/locales/en/common.json b/i18n/locales/en/common.json
@@ -203,12 +203,12 @@
   "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 feature you need to sign in to your Lisk account.": "In order to use this feature you need to sign in to your Lisk account.",
-  "Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will added to the voting queue.": "Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will 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.": "Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will be added to the voting queue.",
   "Initialize": "Initialize",
   "Initialize your account": "Initialize your account",
   "Input transaction data": "Input transaction data",
   "Input view": "Input view",
-  "Insert a vote amount for this delegate. Your new vote will added to the voting queue.": "Insert a vote amount for this delegate. Your new vote will added to the voting queue.",
+  "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.",
   "Insert entire signed message": "Insert entire signed message",
   "Insert label": "Insert label",
   "Insert message": "Insert message",
@@ -253,7 +253,6 @@
   "Lisk {{version}} is here!": "Lisk {{version}} is here!",
   "Load more": "Load more",
   "Loading": "Loading",
-  "Locale": "Locale",
   "Locked balance details": "Locked balance details",
   "Looking for a device...": "Looking for a device...",
   "Low": "Low",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Lisk",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
   "license": "GPL-3.0",
   "productName": "Lisk",

diff --git a/src/components/screens/editVote/index.js b/src/components/screens/editVote/index.js
@@ -21,11 +21,11 @@ import styles from './editVote.css';
 const getTitles = t => ({
   edit: {
     title: t('Edit vote'),
-    description: t('Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will added to the voting queue.'),
+    description: t('Increase or decrease your vote amount, or remove your vote from this delegate. Your updated vote will be added to the voting queue.'),
   },
   add: {
     title: t('Add vote'),
-    description: t('Insert a vote amount for this delegate. Your new vote will added to the voting queue.'),
+    description: t('Insert a vote amount for this delegate. Your new vote will be added to the voting queue.'),
   },
 });
 

diff --git a/src/components/screens/send/form/formBtc.js b/src/components/screens/send/form/formBtc.js
@@ -16,7 +16,7 @@ const FormBtc = (props) => {
   const [
     selectedPriority, selectTransactionPriority, priorityOptions,
   ] = useTransactionPriority(token);
-  const [amount, setAmountField] = useAmountField(getInitialValue('amount'), token);
+  const [amount, setAmountField] = useAmountField(getInitialValue('amount'), account.summary?.balance ?? 0, token);
   const [recipient, setRecipientField] = useRecipientField(getInitialValue('recipient'));
   const { fee, maxAmount, minFee } = useTransactionFeeCalculation({
     selectedPriority,

diff --git a/src/components/screens/settings/settings.js b/src/components/screens/settings/settings.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { toast } from 'react-toastify';
-import { isEmpty } from '@utils/helpers';
 import Piwik from '@utils/piwik';
 import { externalLinks, settings as settingsConst } from '@constants';
 import Box from '@toolbox/box';
@@ -78,9 +77,8 @@ class Settings extends React.Component {
           </BoxHeader>
           <BoxContent className={styles.content}>
             <section>
-              <h2>{t('Locale')}</h2>
+              <h2>{t('Currency')}</h2>
               <div className={styles.fieldGroup}>
-                <span className={styles.labelName}>{t('Currency')}</span>
                 <Select
                   options={currencies.map(currency => ({
                     label: currency, value: currency,
@@ -149,7 +147,7 @@ class Settings extends React.Component {
                 </div>
               </label>
               {
-                !isHardwareWalletAccount && !isEmpty(account)
+                !isHardwareWalletAccount
                   ? (
                     <label className={`${styles.fieldGroup} ${styles.checkboxField} enableBTC`}>
                       <CheckBox

diff --git a/src/components/screens/wallet/delegateProfile/delegateProfile.js b/src/components/screens/wallet/delegateProfile/delegateProfile.js
@@ -14,6 +14,7 @@ const DelegateProfile = ({
   const { data } = delegate;
   useEffect(() => {
     voters.loadData({ aggregate: true });
+    delegate.loadData();
   }, [account]);
 
   useEffect(() => {

diff --git a/src/components/shared/transactionInfo/voteDelegate.js b/src/components/shared/transactionInfo/voteDelegate.js
@@ -33,7 +33,7 @@ const VoteDelegate = ({
   const addedLength = Object.keys(added).length;
   const editedLength = Object.keys(edited).length;
   const removedLength = Object.keys(removed).length;
-  const sentVotes = account.dpos.sentVotes?.length ?? 0;
+  const sentVotes = account.dpos?.sentVotes?.length ?? 0;
 
   return (
     <>

diff --git a/src/constants/account.js b/src/constants/account.js
@@ -1,5 +1,5 @@
 export const balanceNeededForInitialization = 2e7;
-export const balanceNeededForReclaim = 1e6;
+export const balanceNeededForReclaim = 5e6;
 const account = {
   lockDuration: 600000, // lock duration time is 10 minutes in milliSecond
   warnLockDuration: 480000, // warning time is 8 minutes in milliSecond

diff --git a/src/store/actions/account.js b/src/store/actions/account.js
@@ -61,7 +61,10 @@ export const accountDataUpdated = tokensTypes =>
       if (token === tokenMap.LSK.key) {
         acc[token] = { address: account.info[tokenMap.LSK.key].summary.address };
       } else {
-        acc[token] = { address: account.info[token].address };
+        acc[token] = {
+          address: account.info[token].summary.address,
+          passphrase: account.passphrase,
+        };
       }
       return acc;
     }, {});

diff --git a/src/store/middlewares/account.js b/src/store/middlewares/account.js
@@ -53,13 +53,15 @@ const filterIncomingTransactions = (transactions, account) => transactions.filte
 const showNotificationsForIncomingTransactions = (transactions, account, token) => {
   filterIncomingTransactions(transactions, account).forEach((transaction) => {
     const amount = fromRawLsk(transaction.asset.amount);
-    const message = transaction.asset.data
-      ? i18n.t('with message {{message}}', { message: transaction.asset.data })
-      : '';
-    // eslint-disable-next-line no-new
-    new Notification(i18n.t('{{amount}} {{token}} Received', { amount, token }), {
-      body: i18n.t('Your account just received {{amount}} {{token}} {{message}}', { amount, token, message }),
-    });
+    if (amount > 0) {
+      const message = transaction.asset.data
+        ? i18n.t('with message {{message}}', { message: transaction.asset.data })
+        : '';
+      // eslint-disable-next-line no-new
+      new Notification(i18n.t('{{amount}} {{token}} Received', { amount, token }), {
+        body: i18n.t('Your account just received {{amount}} {{token}} {{message}}', { amount, token, message }),
+      });
+    }
   });
 };
 

diff --git a/src/utils/notification.js b/src/utils/notification.js
@@ -53,8 +53,10 @@ export class Notify {
    * @memberof Notify
    */
   _deposit(amount) { // eslint-disable-line
-    const body = i18next.t('You\'ve received {{value}} LSK.', { value: fromRawLsk(amount) });
-    new window.Notification(i18next.t('LSK received'), { body }); // eslint-disable-line
+    if (amount > 0) {
+      const body = i18next.t('You\'ve received {{value}} LSK.', { value: fromRawLsk(amount) });
+      new window.Notification(i18next.t('LSK received'), { body }); // eslint-disable-line
+    }
   }
 }