Merge pull request #5430 from LiskHQ/5429-fix-issues-observed-on-3.0.…

…0-rc.3

Fix issues observed on 3.0.0-rc.3

src/modules/transaction/__fixtures__/mockTransactions.js

@@ -36,7 +36,7 @@ const transaction = (index) => ({
   executionStatus: 'pending',
   meta: {
     recipient: {
-      address: 'lsk24cd35u4jdq8szo3pnsqe5dsxwrnazyqqqg5eu',
+      address: 'lsktk7bj2yadx5vq3f87gh5cwca7ptpk5djpxhhc3',
       publicKey: '2ca9a7...c23079',
       name: 'genesis_49',
     },

src/modules/transaction/components/BlockDetailsTransactions/BlockDetailsTransactionHeaderMap.js

@@ -5,22 +5,28 @@ export default (t) => [
   {
     title: t('ID'),
     classList: grid['col-xs-2'],
+    placeholder: 'walletWithAddress',
   },
   {
     title: t('Sender'),
     classList: grid['col-xs-2'],
+    placeholder: 'walletWithAddress',
   },
   {
     title: t('Height'),
-    classList: grid['col-xs-2'],
+    classList: `${grid['col-xs-1']} ${styles.transactionFeeCell}`,
   },
   {
     title: t('Type'),
-    classList: `${grid['col-xs-4']} ${grid['col-md-3']}`,
+    classList: `${grid['col-xs-2']} ${grid['col-md-2']}`,
+  },
+  {
+    title: t('Value'),
+    classList: `${grid['col-xs-2']} ${grid['col-md-2']}`,
   },
   {
     title: t('Date'),
-    classList: `${grid['col-md-2']} ${styles.transactionFeeCell}`,
+    classList: `${grid['col-md-2']} ${grid['col-xs-3']}`,
   },
   {
     title: t('Status'),

src/modules/transaction/components/Explorer/ExplorerTransactionsHeaderMap.js

@@ -3,7 +3,7 @@ import styles from './ExplorerTransactions.css';
 
 export default (t, activeToken, changeSort) => [
   {
-    title: t('Recipient'),
+    title: t('Sender'),
     classList: `${grid['col-xs-3']} ${styles.transactionTitle}`,
   },
   {

src/modules/transaction/components/TransactionDetailsView/index.js

@@ -58,6 +58,7 @@ const TransactionDetails = () => {
       fee,
       block = {},
       executionStatus,
+      meta,
     } = transactionData;
     const [txModule, txType] = splitModuleAndCommand(moduleCommand);
 
@@ -72,6 +73,11 @@ const TransactionDetails = () => {
         value: sender,
         type: 'address',
       },
+      meta?.recipient && {
+        label: t('Recipient'),
+        value: meta.recipient,
+        type: 'address',
+      },
       {
         label: t('Fee'),
         value: <TokenAmount val={fee} token={feeToken} />,
@@ -113,7 +119,7 @@ const TransactionDetails = () => {
         label: t('Parameters'),
         type: 'expand',
       },
-    ];
+    ].filter((value) => value);
   }, [transactionData]);
 
   if (error || (isEmpty(transactionMetaData) && !isFetching)) {

src/modules/transaction/components/TransactionDetailsView/index.test.js

@@ -81,6 +81,7 @@ describe('TransactionDetailsView', () => {
   it('should display Transaction Events properly', async () => {
     expect(screen.getByText('Type')).toBeTruthy();
     expect(screen.getByText('Sender')).toBeTruthy();
+    expect(screen.getByText('Recipient')).toBeTruthy();
     expect(screen.getByText('Fee')).toBeTruthy();
     expect(screen.getByText('Date')).toBeTruthy();
     expect(screen.getByText('Nonce')).toBeTruthy();

src/modules/transaction/components/TransactionMonitor/transactionsTable.css

@@ -9,7 +9,7 @@
   }
 
   & > div:last-child {
-    justify-content: flex-start;
+    justify-content: flex-end;
   }
 }
 

src/modules/transaction/components/TransactionRow/schemas.css

@@ -64,7 +64,7 @@
     }
 
     & > *:last-child {
-      justify-content: center;
+      margin-left: auto;
     }
 
     @media (--medium-viewport) {
@@ -107,8 +107,8 @@
     }
 
     & > *:nth-child(5) {
-      flex-basis: 8.33333333%;
-      max-width: 8.33333333%;
+      flex-basis: 16.66666667%;
+      max-width: 16.66666667%;
     }
 
     & > *:first-child {

src/modules/transaction/components/TxSignatureCollector/TxSignatureCollector.js

@@ -10,6 +10,7 @@ import { useAuth } from '@auth/hooks/queries';
 import { useCurrentAccount } from '@account/hooks';
 import useNonceSync from '@auth/hooks/useNonceSync';
 import HWSigning from '@hardwareWallet/components/HWSigning/HWSigning';
+import { TRANSACTION_SIGNING_TYPES } from 'src/modules/wallet/configuration/constants';
 import styles from './txSignatureCollector.css';
 import { joinModuleAndCommand, fromTransactionJSON, encodeTransaction } from '../../utils';
 import { MODULE_COMMANDS_NAME_MAP } from '../../configuration/moduleCommand';
@@ -30,7 +31,7 @@ const TxSignatureCollector = ({
   fees,
   selectedPriority,
   confirmText,
-  type = 'transaction',
+  type = TRANSACTION_SIGNING_TYPES.TRANSACTION,
 }) => {
   const [currentAccount] = useCurrentAccount();
   const { moduleCommandSchemas, messagesSchemas } = useCommandSchema();
@@ -108,12 +109,14 @@ const TxSignatureCollector = ({
   };
 
   const onEnterPasswordSuccess = ({ privateKey }) => {
-    const paramsSchema = moduleCommandSchemas[moduleCommand];
-    const transaction = fromTransactionJSON(transactionJSON, paramsSchema);
-    const buffer = encodeTransaction(transaction, paramsSchema);
-    const transactionHex = cryptography.utils.hash(buffer).toString('hex');
-    if (isTransactionAuthor) {
-      incrementNonce(transactionHex);
+    if (type !== TRANSACTION_SIGNING_TYPES.MESSAGE) {
+      const paramsSchema = moduleCommandSchemas[moduleCommand];
+      const transaction = fromTransactionJSON(transactionJSON, paramsSchema);
+      const buffer = encodeTransaction(transaction, paramsSchema);
+      const transactionHex = cryptography.utils.hash(buffer).toString('hex');
+      if (isTransactionAuthor) {
+        incrementNonce(transactionHex);
+      }
     }
     txVerification(privateKey, currentAccount?.metadata.pubkey);
   };

src/modules/wallet/components/RegisterMultisigForm/index.js

@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
 import BoxContent from 'src/theme/box/content';
 import BoxHeader from 'src/theme/box/header';
 import { TertiaryButton } from 'src/theme/buttons';
+import Feedback from 'src/theme/feedback/feedback';
 import { Input } from 'src/theme';
 import { MODULE_COMMANDS_NAME_MAP } from '@transaction/configuration/moduleCommand';
 import TxComposer from '@transaction/components/TxComposer';
@@ -77,6 +78,7 @@ const Form = ({ nextStep, prevState = {}, onNext, authQuery }) => {
     getInitialSignaturesState(prevState)
   );
   const [members, setMembers] = useState(() => getInitialMembersState(prevState));
+  const [requiredSignatureError, setRequiredSignatureError] = useState('');
 
   const [currentAccount] = useCurrentAccount();
   const [currentApplication] = useCurrentApplication();
@@ -124,6 +126,12 @@ const Form = ({ nextStep, prevState = {}, onNext, authQuery }) => {
   const changeNumberOfSignatures = (e) => {
     const value = e.target.value ? Number(e.target.value) : undefined;
 
+    if (value > MAX_MULTI_SIG_MEMBERS) {
+      setRequiredSignatureError(`Cannot have more than ${MAX_MULTI_SIG_MEMBERS} required signature`);
+      return;
+    }
+
+    setRequiredSignatureError('');
     setNumberOfSignatures(value);
   };
 
@@ -226,6 +234,9 @@ const Form = ({ nextStep, prevState = {}, onNext, authQuery }) => {
                 autoComplete="off"
                 name="required-signatures"
               />
+              {!!requiredSignatureError && (
+                <Feedback message={requiredSignatureError} status="error" />
+              )}
             </div>
             <div className={`${styles.membersControls} multisignature-members-controls`}>
               <span>{t('Members')}</span>

src/modules/wallet/configuration/constants.js

@@ -1,2 +1,6 @@
 export const MAX_MULTI_SIG_MEMBERS = 64;
 export const DEFAULT_SIGNATURE_BYTE_SIZE = 64;
+export const TRANSACTION_SIGNING_TYPES = {
+  MESSAGE: 'message',
+  TRANSACTION: 'transaction',
+};