Feature/dpos update

Jenkinsfile.builds

@@ -37,8 +37,8 @@ pipeline {
 						nvm(getNodejsVersion()) {
 							sh '''
 							npm ci
-							cp -R /Users/jenkins/fonts/basierCircle src/assets/fonts
-							cp -R /Users/jenkins/fonts/gilroy src/assets/fonts
+							cp -R /Users/jenkins/fonts/basierCircle setup/react/assets/fonts
+							cp -R /Users/jenkins/fonts/gilroy setup/react/assets/fonts
 							npm run build
 							npm run install:electron:dependencies
 							npm run dist:mac -- --publish never

package.json

@@ -115,7 +115,7 @@
     "@json-rpc-tools/utils": "1.7.6",
     "@ledgerhq/hw-transport": "6.3.0",
     "@ledgerhq/hw-transport-node-hid": "6.6.0",
-    "@liskhq/lisk-client": "6.0.0-alpha.11",
+    "@liskhq/lisk-client": "6.0.0-alpha.13",
     "@tanstack/react-query": "4.0.10",
     "@tanstack/react-query-devtools": "4.2.1",
     "@walletconnect/sign-client": "2.0.0-rc.4",
@@ -160,7 +160,6 @@
     "react": "16.14.0",
     "react-chartjs-2": "=2.8.0",
     "react-copy-to-clipboard": "5.0.3",
-    "react-countdown": "2.2.1",
     "react-dom": "16.14.0",
     "react-fast-compare": "2.0.4",
     "react-highlight-words": "0.17.0",

src/const/queries.js

@@ -36,4 +36,5 @@ export const POS_REWARDS_CLAIMABLE = 'GET_POS_REWARDS_CLAIMABLE';
 export const REWARD_DEFAULT = 'GET_REWARD_DEFAULT';
 export const REWARD_INFLATION = 'GET_REWARD_INFLATION';
 export const REWARD_CONSTANTS = 'GET_REWARD_CONSTANTS';
+export const INVOKE = 'POST_PROXY_INVOKE';
 export const INITIALIZED_ACCOUNTS = 'GET_INITIALIZED_ACCOUNTS';

src/locales/en/common.json

@@ -105,6 +105,7 @@
   "Caution! You are about to stake for the punished validator, this will result in your LSK tokens being locked for a period of {{daysLeft}} days. In addition, please note that your stake will not be counted until the {{daysLeft}} day period has expired. ": "Caution! You are about to stake for the punished validator, this will result in your LSK tokens being locked for a period of {{daysLeft}} days. In addition, please note that your stake will not be counted until the {{daysLeft}} day period has expired. ",
   "Chain ID": "Chain ID",
   "Chain ID:": "Chain ID:",
+  "Change Commission succeeded": "Change Commission succeeded",
   "Changed stakes": "Changed stakes",
   "Check for Updates...": "Check for Updates...",
   "Choose a hardware wallet to perform your transactions on add to your Lisk Desktop": "Choose a hardware wallet to perform your transactions on add to your Lisk Desktop",
@@ -124,6 +125,7 @@
   "Commission": "Commission",
   "Commission (%)": "Commission (%)",
   "Commission :": "Commission :",
+  "Commission range is invalid": "Commission range is invalid",
   "Community is key. Stake for validators, or register as one yourself. Feel like a feature is missing? Request it directly from the Lisk.": "Community is key. Stake for validators, or register as one yourself. Feel like a feature is missing? Request it directly from the Lisk.",
   "Configure account": "Configure account",
   "Confirm": "Confirm",
@@ -196,6 +198,7 @@
   "Edit Stake": "Edit Stake",
   "Edit account name": "Edit account name",
   "Edit bookmark": "Edit bookmark",
+  "Edit commission": "Edit commission",
   "Edit stake": "Edit stake",
   "Effortlessly send and receive tokens": "Effortlessly send and receive tokens",
   "Either change the optional member to mandatory or define more optional members.": "Either change the optional member to mandatory or define more optional members.",
@@ -359,6 +362,7 @@
   "Network statistics": "Network statistics",
   "Network switcher": "Network switcher",
   "New": "New",
+  "New Commission": "New Commission",
   "New blocks": "New blocks",
   "New bookmark": "New bookmark",
   "New transactions": "New transactions",
@@ -389,6 +393,7 @@
   "Number of transactions / Volume (LSK)": "Number of transactions / Volume (LSK)",
   "Official guidelines": "Official guidelines",
   "Ok": "Ok",
+  "Old Commission": "Old Commission",
   "Old wallet address": "Old wallet address",
   "Only members of the group can sign the transaction.": "Only members of the group can sign the transaction.",
   "Opt-in to sharing anonymous data in order to improve Lisk.": "Opt-in to sharing anonymous data in order to improve Lisk.",
@@ -499,7 +504,6 @@
   "Required": "Required",
   "Required signatures": "Required signatures",
   "Requirements": "Requirements",
-  "Reset time": "Reset time",
   "Restart app": "Restart app",
   "Restore from JSON file": "Restore from JSON file",
   "Restore from backup": "Restore from backup",
@@ -547,7 +551,6 @@
   "Send {{token}}": "Send {{token}}",
   "Send {{token}} here": "Send {{token}} here",
   "Sender": "Sender",
-  "Session timed out": "Session timed out",
   "Set up your account password": "Set up your account password",
   "Settings": "Settings",
   "Settings saved!": "Settings saved!",
@@ -602,6 +605,7 @@
   "Terms of Use": "Terms of Use",
   "The aggregated LSK volume transferred over the selected time period.": "The aggregated LSK volume transferred over the selected time period.",
   "The chain ID uniquely identifies a chain in the Lisk ecosystem": "The chain ID uniquely identifies a chain in the Lisk ecosystem",
+  "The commission set will be your reward while the rest will be shared with the stakers.": "The commission set will be your reward while the rest will be shared with the stakers.",
   "The default application can not be removed": "The default application can not be removed",
   "The list shown only contains peers connected to the current Lisk Service node.": "The list shown only contains peers connected to the current Lisk Service node.",
   "The message can't contain whitespace at the beginning or end.": "The message can't contain whitespace at the beginning or end.",
@@ -713,13 +717,13 @@
   "View all tokens": "View all tokens",
   "View multisignature account details": "View multisignature account details",
   "View remaining": "View remaining",
+  "View your validator profile.": "View your validator profile.",
   "Volume": "Volume",
   "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",
   "We kindly ask you to transfer your balance to the new account.": "We kindly ask you to transfer your balance to the new account.",
   "Welcome to": "Welcome to",
@@ -751,15 +755,14 @@
   "You will be notified when your transaction is confirmed.": "You will be notified when your transaction is confirmed.",
   "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 balance will be transfered in a few seconds.": "Your balance will be transfered in a few seconds.",
   "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.",
   "Your signature was successful": "Your signature was successful",
   "Your signature will replace one optional signature.": "Your signature will replace one optional signature.",
   "Your stake has been added to your staking queue": "Your stake has been added to your staking queue",
   "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 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.",

src/modules/auth/hooks/queries/index.js

@@ -1 +1,3 @@
 export * from './useAuth';
+export * from './useGetInitializationFees';
+export * from './useMessageFee';

src/modules/auth/hooks/queries/useGetInitializationFees.js

@@ -0,0 +1,30 @@
+import { useInvokeQuery } from '@common/hooks';
+import { useTokensBalance } from 'src/modules/token/fungible/hooks/queries';
+import { useAuth } from './useAuth';
+
+export const useGetInitializationFees = ({ options = {}, address } = {}) => {
+  const config = {
+    data: {
+      endpoint: 'token_getInitializationFees',
+      params: {},
+    },
+  };
+
+  const queryConfig = {
+    options: { enabled: !!address },
+    config: { params: { address } },
+  };
+
+  const { data: auth, isLoading: isAuthLoading } = useAuth(queryConfig);
+  const { data: token, isLoading: isTokenLoading } = useTokensBalance(queryConfig);
+
+  const isAccountInitialized = auth?.data?.nonce !== '0' && +token?.data?.[0]?.availableBalance > 0;
+  const shouldReturnInitalizationFee = !isAccountInitialized && !isAuthLoading && !isTokenLoading;
+
+  const result = useInvokeQuery({
+    config,
+    options: { ...options, enabled: shouldReturnInitalizationFee },
+  });
+
+  return shouldReturnInitalizationFee ? result : { data: null };
+};

src/modules/auth/hooks/queries/useGetInitializationFees.test.js

@@ -0,0 +1,82 @@
+import { useAuth } from '@auth/hooks/queries';
+import { mockAuth } from '@auth/__fixtures__';
+import { renderHook } from '@testing-library/react-hooks';
+import { useTokensBalance } from '@token/fungible/hooks/queries';
+import { queryWrapper as wrapper } from 'src/utils/test/queryWrapper';
+import { mockTokensBalance } from '@token/fungible/__fixtures__/mockTokens';
+import { useGetInitializationFees } from './useGetInitializationFees';
+
+jest.useRealTimers();
+
+jest.mock('@auth/hooks/queries/useAuth');
+jest.mock('@token/fungible/hooks/queries');
+
+beforeEach(() => jest.clearAllMocks());
+
+describe('useGetInitializationFees hook', () => {
+  it('should not call the useInvoke query if token is still loading', () => {
+    useTokensBalance.mockReturnValue({ data: mockTokensBalance, isLoading: true });
+    useAuth.mockReturnValue({ data: mockAuth, isLoading: false });
+    const { result } = renderHook(
+      () => useGetInitializationFees({ address: 'lsktzb4j7e3knk4mkxckdr3y69gtu2nwmsb3hjbkg' }),
+      { wrapper }
+    );
+
+    expect(result.current.data).toBe(null);
+  });
+
+  it('does not call the useInoke query if auth is still loading', () => {
+    useTokensBalance.mockReturnValue({ data: mockTokensBalance, isLoading: false });
+    useAuth.mockReturnValue({ data: mockAuth, isLoading: true });
+    const { result } = renderHook(
+      () => useGetInitializationFees({ address: 'lsktzb4j7e3knk4mkxckdr3y69gtu2nwmsb3hjbkg' }),
+      { wrapper }
+    );
+
+    expect(result.current.data).toBe(null);
+  });
+
+  it('does not call the useInoke query if both auth and token is still loading', () => {
+    useTokensBalance.mockReturnValue({ data: mockTokensBalance, isLoading: true });
+    useAuth.mockReturnValue({ data: mockAuth, isLoading: true });
+    const { result } = renderHook(
+      () => useGetInitializationFees({ address: 'lsktzb4j7e3knk4mkxckdr3y69gtu2nwmsb3hjbkg' }),
+      { wrapper }
+    );
+
+    expect(result.current.data).toBe(null);
+  });
+
+  it('does not call the useInoke query if account is not initialized', async () => {
+    useTokensBalance.mockReturnValue({ data: mockTokensBalance, isLoading: false });
+    useAuth.mockReturnValue({
+      data: mockAuth,
+      isLoading: false,
+    });
+    const { result, waitFor } = renderHook(
+      () => useGetInitializationFees({ address: 'lsktzb4j7e3knk4mkxckdr3y69gtu2nwmsb3hjbkg' }),
+      { wrapper }
+    );
+
+    await waitFor(() => !result.current.isLoading);
+
+    expect(result.current.data).toEqual({
+      data: { escrowAccount: '5000000', userAccount: '5000000' },
+      meta: { endpoint: 'token_getInitializationFees', params: {} },
+    });
+  });
+
+  it('does not call the useInoke query if account is not initialized', () => {
+    useTokensBalance.mockReturnValue({ data: mockTokensBalance, isLoading: false });
+    useAuth.mockReturnValue({
+      data: { ...mockAuth, data: { ...mockAuth.data, nonce: '2' } },
+      isLoading: false,
+    });
+    const { result } = renderHook(
+      () => useGetInitializationFees({ address: 'lsktzb4j7e3knk4mkxckdr3y69gtu2nwmsb3hjbkg' }),
+      { wrapper }
+    );
+
+    expect(result.current.data).toBe(null);
+  });
+});

src/modules/auth/hooks/queries/useMessageFee.js

@@ -0,0 +1,10 @@
+// @Todo: should be re-instated and refactored when the command to get ccm fee has been implemented
+export const useMessageFee = (/* { options = {}, isEnabled } = {} */) => {
+  // const result = useInvokeQuery({
+  //   config,
+  //   options: { ...options, enabled: isEnabled },
+  // });
+  const messageFee = 50000000;
+
+  return { data: messageFee };
+};

src/modules/common/__fixtures__/mockInvoke.js

@@ -0,0 +1,10 @@
+export const mockInvoke = {
+  data: {
+    userAccount: '5000000',
+    escrowAccount: '5000000',
+  },
+  meta: {
+    endpoint: 'token_getInitializationFees',
+    params: {},
+  },
+};

src/modules/common/components/amountField/index.js

@@ -30,7 +30,7 @@ export const MaxAmountWarning = ({ resetInput, message, ignoreClicks }) => {
 // eslint-disable-next-line complexity
 const AmountField = ({
   amount,
-  maxAmount,
+  maxAmount = {},
   onChange,
   className,
   label,