fix: conflicts

AstarNetwork · Dec 29, 2023 · 4432063 · 4432063
2 parents 3fa5c06 + dc84ab8
commit 4432063
Show file tree

Hide file tree

Showing 30 changed files with 869 additions and 274 deletions.
diff --git a/public/images/bk_maintenance.png b/public/images/bk_maintenance.png
diff --git a/src/components/assets/Assets.vue b/src/components/assets/Assets.vue
@@ -16,16 +16,15 @@
         <template v-if="isDappStakingV3">
           <staking />
         </template>
-        <div class="container">
-          <div v-if="!isLoading" class="container">
-            <div v-if="isH160">
-              <evm-asset-list :tokens="evmAssets.assets" />
-            </div>
-            <div v-else>
-              <!-- Memo: hide xvm panel because AA might replace it -->
-              <!-- <xvm-native-asset-list v-if="isSupportXvmTransfer" :xvm-assets="xvmAssets.xvmAssets" /> -->
-              <xcm-native-asset-list v-if="isEnableXcm" :xcm-assets="xcmAssets.assets" />
-            </div>
+
+        <div v-if="!isLoading" class="container">
+          <div v-if="isH160">
+            <evm-asset-list :tokens="evmAssets.assets" />
+          </div>
+          <div v-else>
+            <!-- Memo: hide xvm panel because AA might replace it -->
+            <!-- <xvm-native-asset-list v-if="isSupportXvmTransfer" :xvm-assets="xvmAssets.xvmAssets" /> -->
+            <xcm-native-asset-list v-if="isEnableXcm" :xcm-assets="xcmAssets.assets" />
           </div>
         </div>
       </div>

diff --git a/src/data/dapp_promotions.json b/src/data/dapp_promotions.json
@@ -1,4 +1,10 @@
 [
+  {
+    "name": "Lucky - No-loss lottery",
+    "shortDescription": "The more you stake, the more chance you have to win a raffle!",
+    "link": "https://portal.astar.network/astar/dapp-staking/dapp?dapp=zsv1gvepvmwfdshmwgczs4zyvmmwesbjwqjn4wdpuefrrpy",
+    "img": "https://bafybeibgfpewtydc54s5jc2gkuh7kfzv7zmt4z2odthv5o7inn6n7ub6mq.ipfs.nectarnode.io/?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjaWQiOiJiYWZ5YmVpYmdmcGV3dHlkYzU0czVqYzJna3VoN2tmenY3em10NHoyb2R0aHY1bzdpbm42bjd1YjZtcSIsInByb2plY3RfdXVpZCI6IjNmYjA3NjMwLWViYjQtNGY3Yi1hZmYyLTBhYzY3ZjUzYTdmMSIsImlhdCI6MTcwMzEwNjk2Miwic3ViIjoiSVBGUy10b2tlbiJ9.rJo4LofxqdGB2EXY888sgP2OJsQFqDvlstkBztc4P9o"
+  },
   {
     "name": "Neurolanche - Stake & Earn",
     "shortDescription": "Join our staking and earn soulbound 'Rewarding' NFT.",

diff --git a/src/hooks/wallet/useAccountUnification.ts b/src/hooks/wallet/useAccountUnification.ts
@@ -33,6 +33,7 @@ import { AbiItem } from 'web3-utils';
 import { useNetworkInfo } from '../useNetworkInfo';
 import { IAccountUnificationRepository, IIdentityRepository } from 'src/v2/repositories';
 import { UnifiedAccount } from 'src/store/general/state';
+import { getRawEvmTransaction } from 'src/modules/evm';
 
 const provider = get(window, 'ethereum') as any;
 
@@ -280,19 +281,14 @@ export const useAccountUnification = () => {
     try {
       isSendingXc20Tokens.value = true;
       const from = selectedEvmAddress.value;
-      const [nonce, gasPrice] = await Promise.all([
-        web3.value.eth.getTransactionCount(from),
-        web3.value.eth.getGasPrice(),
-      ]);
-      const multipliedGas = Math.round(Number(gasPrice) * 1.01);
-      const rawTx = {
-        nonce,
-        gasPrice: web3.value.utils.toHex(multipliedGas.toString()),
+      const rawTx = await getRawEvmTransaction(
+        web3.value,
         from,
-        to: evmPrecompiledContract.dispatch,
-        value: '0x0',
-        data: transferXc20CallData.value,
-      };
+        evmPrecompiledContract.dispatch,
+        transferXc20CallData.value,
+        '0x0'
+      );
+
       const estimatedGas = await web3.value.eth.estimateGas(rawTx);
       await web3.value.eth
         .sendTransaction({ ...rawTx, gas: estimatedGas })

diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
@@ -435,6 +435,11 @@ export default {
       warningLeaveMinAmount:
         'Account must hold greater than {amount}{symbol} in transferrable when you stake.',
     },
+    maintenance: {
+      switching: 'Switching to',
+      willBeBack: 'We will be back',
+      verySoon: 'very soon',
+    },
   },
   assets: {
     astarNativeAccount: 'Astar Native Account',
@@ -703,6 +708,9 @@ export default {
     },
     successfullyStaked: 'You successfully staked to {contractAddress}',
     voteTitle: 'Vote!',
+    voteText: 'I would like to vote my tokens with',
+    transferText: 'I would like to move my funds from',
+    stakeVoteOn: 'And vote/stake on',
     stakeTitle: 'Stake!',
     minimumStakingAmount: 'Minimum staking amount is {amount} {symbol}',
     minBalanceAfterStaking:
@@ -729,13 +737,14 @@ export default {
     newDappPromotion: 'New dApp promotion',
     votingNow: 'Voting Now',
     voteNow: 'Vote now',
+    voteStakeToday: 'Vote / Stake today',
     vote: 'Vote',
-    voteToday: 'Vote today and be eligible for  bonus rewards',
+    voteToday: 'Be entitled to bonus pool today',
     stakeOn: 'Stake on {name}',
     tier: 'Tier',
     tierLeaderboard: 'Tier Leaderboard',
+    projectLeaderboards: 'Project Leaderboards',
     rewardPerDay: 'Reward per era',
-    leaderboard: 'Leaderboard',
     myStaking: 'My Staking',
     myDapps: 'My dApps',
     unbonding: 'Unbonding',