Merge branch 'development' into 5544-commission-change-history-view

LiskHQ · Dec 11, 2023 · b59ab83 · b59ab83
2 parents 31f1532 + 392b153
commit b59ab83
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 39 deletions.
diff --git a/e2e/steps/TokenTransfer.mjs b/e2e/steps/TokenTransfer.mjs
@@ -28,20 +28,22 @@ Then(
 );
 
 Then('the first transaction row should contain latest transaction details', async () => {
-  await expect(fixture.page.locator('.transactions-row').nth(0)).toContainText(/Token transfer/i);
-  await expect(fixture.page.locator('.transactions-row').nth(0)).toContainText(/Today at/i);
+  // Fix this with https://github.com/LiskHQ/lisk-desktop/issues/5547
+  // await expect(fixture.page.locator('.transactions-row').nth(0)).toContainText(/Token transfer/i);
+  // await expect(fixture.page.locator('.transactions-row').nth(0)).toContainText(/Today at/i);
 });
 
 Then('I should see event table details', async () => {
-  await expect(
-    fixture.page.locator('.transaction-events-header').filter({ hasText: 'Block height' })
-  ).toBeVisible();
-  await expect(
-    fixture.page.locator('.transaction-events-header').filter({ hasText: 'Transaction ID' })
-  ).toBeVisible();
-  await expect
-    .poll(() => fixture.page.locator('.transaction-event-row').count())
-    .toBeGreaterThan(0);
+  // Fix this with https://github.com/LiskHQ/lisk-desktop/issues/5547
+  // await expect(
+  //   fixture.page.locator('.transaction-events-header').filter({ hasText: 'Block height' })
+  // ).toBeVisible();
+  // await expect(
+  //   fixture.page.locator('.transaction-events-header').filter({ hasText: 'Transaction ID' })
+  // ).toBeVisible();
+  // await expect
+  //   .poll(() => fixture.page.locator('.transaction-event-row').count())
+  //   .toBeGreaterThan(0);
 });
 
 Then('I should see token table details', async () => {

diff --git a/src/const/config.js b/src/const/config.js
@@ -4,4 +4,4 @@ export const API_VERSION = 'v3';
 export const MOCK_SERVICE_WORKER = process.env.REACT_APP_MSW;
 
 export const DEFAULT_NETWORK =
-  REACT_APP_DEFAULT_NETWORK !== 'undefined' ? REACT_APP_DEFAULT_NETWORK : 'testnet';
+  REACT_APP_DEFAULT_NETWORK !== 'undefined' ? REACT_APP_DEFAULT_NETWORK : 'mainnet';
diff --git a/src/locales/en/common.json b/src/locales/en/common.json
@@ -221,13 +221,13 @@
   "Enter connection URI": "Enter connection URI",
   "Enter message": "Enter message",
   "Enter name e.g. peter_pan": "Enter name e.g. peter_pan",
-  "Enter network name": "Enter network name",
+  "Enter network name, e.g Testnet": "Enter network name, e.g Testnet",
   "Enter password": "Enter password",
   "Enter password confirmation": "Enter password confirmation",
   "Enter public key": "Enter public key",
-  "Enter service URL, e.g. https://service.lisk.com or http://localhost:9901": "Enter service URL, e.g. https://service.lisk.com or http://localhost:9901",
+  "Enter service URL, e.g. https://testnet-service.lisk.com": "Enter service URL, e.g. https://testnet-service.lisk.com",
   "Enter stake amount": "Enter stake amount",
-  "Enter websocket service URL, e.g. wss://mainnet-service.lisk.com": "Enter websocket service URL, e.g. wss://mainnet-service.lisk.com",
+  "Enter websocket service URL, e.g. wss://testnet-service.lisk.com": "Enter websocket service URL, e.g. wss://testnet-service.lisk.com",
   "Enter your account password": "Enter your account password",
   "Enter your secret recovery phrase to manage your account.": "Enter your secret recovery phrase to manage your account.",
   "Error": "Error",

diff --git a/src/modules/network/components/DialogAddNetwork/DialogAddNetwork.js b/src/modules/network/components/DialogAddNetwork/DialogAddNetwork.js
@@ -116,7 +116,7 @@ const DialogAddNetwork = () => {
             <Input
               size="l"
               label="Name"
-              placeholder={t('Enter network name')}
+              placeholder={t('Enter network name, e.g Testnet')}
               feedback={errors.name?.message}
               status={errors.name?.message ? 'error' : undefined}
               {...register('name', {
@@ -127,9 +127,7 @@ const DialogAddNetwork = () => {
             <Input
               size="l"
               label="Service URL"
-              placeholder={t(
-                'Enter service URL, e.g. https://service.lisk.com or http://localhost:9901'
-              )}
+              placeholder={t('Enter service URL, e.g. https://testnet-service.lisk.com')}
               value={formValues.serviceUrl}
               feedback={errors.serviceUrl?.message}
               status={errors.serviceUrl?.message ? 'error' : undefined}
@@ -161,7 +159,7 @@ const DialogAddNetwork = () => {
             <Input
               size="l"
               label="Websocket URL (Optional)"
-              placeholder={t('Enter websocket service URL, e.g. wss://mainnet-service.lisk.com')}
+              placeholder={t('Enter websocket service URL, e.g. wss://testnet-service.lisk.com')}
               feedback={errors.wsServiceUrl?.message}
               status={errors.wsServiceUrl?.message ? 'error' : undefined}
               {...register('wsServiceUrl', {

diff --git a/src/modules/network/components/DialogAddNetwork/utils/index.test.js b/src/modules/network/components/DialogAddNetwork/utils/index.test.js
@@ -3,8 +3,8 @@ import { getDuplicateNetworkFields } from './index';
 describe('getDuplicateNetworkFields', () => {
   const MAINNET = {
     name: 'Mainnet',
-    serviceUrl: 'https://mainnet-service.lisk.com',
-    wsServiceUrl: 'wss://mainnet-service.lisk.com',
+    serviceUrl: 'https://service.lisk.com',
+    wsServiceUrl: 'wss://service.lisk.com',
   };
 
   const CUSTOM = {

diff --git a/src/modules/network/configuration/networks.js b/src/modules/network/configuration/networks.js
@@ -13,16 +13,16 @@ const networks = {
   [networkKeys.mainnet]: {
     name: networkKeys.mainnet,
     label: 'Mainnet',
-    serviceUrl: 'https://mainnet-service.lisk.com',
-    wsServiceUrl: 'wss://mainnet-service.lisk.com',
+    serviceUrl: 'https://service.lisk.com',
+    wsServiceUrl: 'wss://service.lisk.com',
     isAvailable: true,
   },
-  [networkKeys.alphanet]: {
-    name: networkKeys.alphanet,
-    label: 'Alphanet',
-    serviceUrl: 'http://alphanet-service.liskdev.net',
-    wsServiceUrl: 'ws://alphanet-service.liskdev.net',
-    isAvailable: false,
+  [networkKeys.testnet]: {
+    name: networkKeys.testnet,
+    label: 'Testnet',
+    serviceUrl: 'https://testnet-service.lisk.com',
+    wsServiceUrl: 'wss://testnet-service.lisk.com',
+    isAvailable: true,
   },
   [networkKeys.betanet]: {
     name: networkKeys.betanet,
@@ -31,20 +31,20 @@ const networks = {
     wsServiceUrl: 'wss://betanet-service.lisk.com',
     isAvailable: false,
   },
+  [networkKeys.alphanet]: {
+    name: networkKeys.alphanet,
+    label: 'Alphanet',
+    serviceUrl: 'http://alphanet-service.liskdev.net',
+    wsServiceUrl: 'ws://alphanet-service.liskdev.net',
+    isAvailable: false,
+  },
   [networkKeys.devnet]: {
     name: networkKeys.devnet,
     label: 'Devnet',
     serviceUrl: 'http://devnet-service.liskdev.net:9901',
     wsServiceUrl: 'ws://devnet-service.liskdev.net:9901',
     isAvailable: false,
   },
-  [networkKeys.testnet]: {
-    name: networkKeys.testnet,
-    label: 'Testnet',
-    serviceUrl: 'https://testnet-service.lisk.com',
-    wsServiceUrl: 'wss://testnet-service.lisk.com',
-    isAvailable: true,
-  },
   [networkKeys.customNode]: {
     name: networkKeys.customNode,
     label: 'CustomNode',

diff --git a/src/modules/pos/reward/hooks/queries/useValidatorRewardsWithToken.js b/src/modules/pos/reward/hooks/queries/useValidatorRewardsWithToken.js
@@ -37,7 +37,7 @@ export const useValidatorRewardsWithToken = () => {
         module,
         command,
         nonce: authNonce,
-        fee: 100000000,
+        fee: 180000,
         senderPublicKey: pubkey,
         params: {},
         signatures: [],

diff --git a/tests/fixtures/blockchainApplicationsManage.js b/tests/fixtures/blockchainApplicationsManage.js
@@ -3,7 +3,7 @@ const blockchainApplicationsManage = [
     chainName: 'Lisk',
     chainID: '00000001',
     status: 'active',
-    serviceURLs: [{ rest: 'http://mainnet-service.lisk.com', ws: 'ws://mainnet-service.lisk.com' }],
+    serviceURLs: [{ rest: 'http://service.lisk.com', ws: 'ws://service.lisk.com' }],
     address: 'lsk24cd35u49jd8szo3pnsqe5dsxwrnazyqqqg5eu',
     logo: {
       png: 'https://lisk-qa.ams3.digitaloceanspaces.com/Artboard%201%20copy%2019.png',