Merge branch 'main' into feat/dapp-staking-v3

.github/workflows/s3-production.yml

@@ -26,6 +26,3 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
       - name: Deploy app build to S3 bucket
         run: aws s3 sync ./dist/spa  s3://astar-apps --delete
-      - name: Run 4everland deploy
-        run: |
-          curl "${{ secrets.HOOK_4EVERLAND }}"

package.json

@@ -25,7 +25,7 @@
     "playwright:ci": "node ./tests/chopsticks/start-chopsticks.js"
   },
   "dependencies": {
-    "@astar-network/astar-sdk-core": "^0.2.7",
+    "@astar-network/astar-sdk-core": "^0.2.8",
     "@astar-network/astar-ui": "^0.0.136",
     "@astar-network/metamask-astar-adapter": "^0.5.4",
     "@astar-network/metamask-astar-types": "^0.6.1",

src/App.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    <decentralized-banner />
     <dashboard-layout>
       <router-view v-slot="{ Component }">
         <keep-alive>
@@ -43,7 +42,6 @@ import 'reflect-metadata';
 import '@polkadot/api-augment';
 import { defineComponent, computed, ref, watch } from 'vue';
 import DashboardLayout from 'layouts/DashboardLayout.vue';
-import DecentralizedBanner from 'src/components/common/DecentralizedBanner.vue';
 import { useStore } from 'src/store';
 import ModalLoading from 'components/common/ModalLoading.vue';
 import AlertBox from 'components/common/AlertBox.vue';
@@ -80,7 +78,6 @@ export default defineComponent({
     CookiePolicy,
     ModalDisclaimer,
     NotificationStack,
-    DecentralizedBanner,
   },
   setup() {
     useAppRouter();

src/boot/api.ts

@@ -1,4 +1,9 @@
-import { capitalize, getRandomFromArray, objToArray } from '@astar-network/astar-sdk-core';
+import {
+  capitalize,
+  getRandomFromArray,
+  hasProperty,
+  objToArray,
+} from '@astar-network/astar-sdk-core';
 import { SubstrateAccount } from 'src/store/general/state';
 import { ApiPromise } from '@polkadot/api';
 import { keyring } from '@polkadot/ui-keyring';
@@ -58,7 +63,7 @@ export default boot(async ({ store }) => {
     store.commit('general/setCurrentNetworkIdx', Number(networkIdxStore));
   }
 
-  let endpoint = selectedEndpoint.hasOwnProperty(networkIdx.value)
+  let endpoint = hasProperty(selectedEndpoint, networkIdx.value)
     ? selectedEndpoint[networkIdx.value]
     : defaultEndpoint;
   if (networkIdx.value === endpointKey.CUSTOM) {
@@ -143,7 +148,7 @@ export default boot(async ({ store }) => {
 
   // execute extension process automatically if selectedAddress is linked or mobile device
   const wallet = String(localStorage.getItem(SELECTED_WALLET));
-  const isSubstrateWallet = supportWalletObj.hasOwnProperty(wallet);
+  const isSubstrateWallet = hasProperty(supportWalletObj, wallet);
 
   if (wallet === SupportWallet.Snap) {
     const isSnapInstalled = await initiatePolkdatodSnap();

src/c-bridge/utils/token-detail/index.ts

@@ -7,6 +7,7 @@ import {
   PeggedPairConfig,
   Token,
 } from 'src/c-bridge';
+import { hasProperty } from '@astar-network/astar-sdk-core';
 
 export const getSelectedToken = ({
   srcChainId,
@@ -69,7 +70,7 @@ export const checkIsCbridgeToken = (token: Erc20Token): boolean => {
 
 export const castCbridgeTokenData = (token: Erc20Token): Erc20Token => {
   const symbolKey = token.symbol.toUpperCase();
-  if (cbridgeCastToken.hasOwnProperty(symbolKey)) {
+  if (hasProperty(cbridgeCastToken, symbolKey)) {
     const data = cbridgeCastToken[symbolKey as keyof typeof cbridgeCastToken];
     return {
       ...token,

src/components/assets/Assets.vue

@@ -14,13 +14,15 @@
           <your-project />
         </div>
         <div 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 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>
       </div>

src/components/assets/EvmNativeToken.vue

@@ -87,8 +87,7 @@ import { $web3 } from 'src/boot/api';
 import { cbridgeAppLink } from 'src/c-bridge';
 import ModalFaucet from 'src/components/assets/modals/ModalFaucet.vue';
 import TokenBalance from 'src/components/common/TokenBalance.vue';
-import { faucetBalRequirement } from 'src/config/wallets';
-import { useAccount, useNetworkInfo, usePrice, useBreakpoints } from 'src/hooks';
+import { useAccount, useNetworkInfo, usePrice, useBreakpoints, useFaucet } from 'src/hooks';
 import { getTokenImage } from 'src/modules/token';
 import { buildTransferPageLink, buildEthereumBridgePageLink } from 'src/router/routes';
 import { useStore } from 'src/store';
@@ -112,6 +111,7 @@ export default defineComponent({
     const store = useStore();
     const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
     const isLoading = computed<boolean>(() => store.getters['general/isLoading']);
+    const { faucetBalRequirement } = useFaucet();
 
     const nativeTokenImg = computed<string>(() =>
       getTokenImage({
@@ -130,7 +130,7 @@ export default defineComponent({
         isRocstar.value = nativeTokenSymbol.value === 'RSTR';
         isFaucet.value = isRocstar.value
           ? false
-          : isShibuya.value || faucetBalRequirement > bal.value;
+          : isShibuya.value || faucetBalRequirement.value > bal.value;
         if (nativeTokenUsd) {
           balUsd.value = nativeTokenUsd * bal.value;
         }

src/components/assets/NativeAssetList.vue

@@ -258,6 +258,7 @@ import {
   useNetworkInfo,
   usePrice,
   useBreakpoints,
+  useFaucet,
 } from 'src/hooks';
 import { checkIsNullOrUndefined, truncate } from '@astar-network/astar-sdk-core';
 import { getTokenImage } from 'src/modules/token';
@@ -269,7 +270,6 @@ import ModalEvmWithdraw from 'src/components/assets/modals/ModalEvmWithdraw.vue'
 import ModalFaucet from 'src/components/assets/modals/ModalFaucet.vue';
 import ModalVesting from 'src/components/assets/modals/ModalVesting.vue';
 import { Path } from 'src/router';
-import { faucetBalRequirement } from 'src/config/wallets';
 
 export default defineComponent({
   components: {
@@ -301,7 +301,7 @@ export default defineComponent({
     const { numEvmDeposit } = useEvmDeposit();
     const { nativeTokenUsd } = usePrice();
     const { currentNetworkName, nativeTokenSymbol, isSupportAuTransfer } = useNetworkInfo();
-
+    const { faucetBalRequirement } = useFaucet();
     const xcmNativeToken = computed(() => generateAstarNativeTokenObject(nativeTokenSymbol.value));
 
     const nativeTokenImg = computed(() =>
@@ -337,7 +337,7 @@ export default defineComponent({
         isRocstar.value = tokenSymbolRef === 'RSTR';
         isFaucet.value = isRocstar.value
           ? false
-          : isShibuya.value || faucetBalRequirement > bal.value;
+          : isShibuya.value || faucetBalRequirement.value > bal.value;
         if (nativeTokenUsd.value) {
           balUsd.value = nativeTokenUsd.value * bal.value;
         } else {

src/components/assets/transfer/LocalTransfer.vue

@@ -106,9 +106,9 @@
 
       <speed-configuration
         v-if="isEnableSpeedConfiguration"
-        :gas-cost="isH160 ? evmGasCost : nativeTipPrice"
-        :selected-gas="isH160 ? selectedGas : selectedTip"
-        :set-selected-gas="isH160 ? setSelectedGas : setSelectedTip"
+        :gas-cost="nativeTipPrice"
+        :selected-gas="selectedTip"
+        :set-selected-gas="setSelectedTip"
       />
 
       <div
@@ -243,11 +243,8 @@ export default defineComponent({
       isChecked,
       isH160,
       isRequiredCheck,
-      selectedGas,
-      evmGasCost,
       isTransferNativeToken,
       isEnableSpeedConfiguration,
-      setSelectedGas,
       inputHandler,
       setSelectedTip,
       transferAsset,
@@ -279,9 +276,7 @@ export default defineComponent({
       fromAddressBalance,
       isChecked,
       isEnableSpeedConfiguration,
-      evmGasCost,
       nativeTipPrice,
-      selectedGas,
       selectedTip,
       isH160,
       isRequiredCheck,
@@ -292,7 +287,6 @@ export default defineComponent({
       currentNetworkName,
       isSupportAuTransfer,
       isValidEvmAddress,
-      setSelectedGas,
       setSelectedTip,
       transfer,
       toMaxAmount,