From a0a73d171a86581190bb9e6aebece400f641c32e Mon Sep 17 00:00:00 2001
From: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Date: Thu, 23 Nov 2023 16:10:46 +0900
Subject: [PATCH] merge the `release-hotfix` to `main` branch (#1025)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
---
 .../dapp-staking/my-staking/MyRewards.vue          |  8 ++++++--
 .../header/modals/ModalConnectWallet.vue           | 13 ++-----------
 src/hooks/dapps-staking/useDispatchGetDapps.ts     | 14 +++++++-------
 src/i18n/en-US/index.ts                            |  2 +-
 src/modules/snap/index.ts                          |  2 +-
 src/store/dapp-staking/actions.ts                  |  8 ++++----
 6 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/components/dapp-staking/my-staking/MyRewards.vue b/src/components/dapp-staking/my-staking/MyRewards.vue
index 8e5124e6e..e352e050e 100644
--- a/src/components/dapp-staking/my-staking/MyRewards.vue
+++ b/src/components/dapp-staking/my-staking/MyRewards.vue
@@ -138,11 +138,15 @@
       <q-icon name="warning" size="20px" class="q-mr-sm" />
       <div>{{ $t('dappStaking.cantClaimWihtoutError') }}</div>
     </div>
-    <!-- TODO: Add a link to the doc -->
     <div v-if="isDappDeveloper" class="info--dapps-owners">
       <span>{{ $t('new') }}</span>
       {{ $t('myReward.dappsOwners') }}
-      <a href="#" target="_blank" rel="noopener noreferrer">{{ $t('myReward.dappsOwnersLink') }}</a>
+      <a
+        href="https://docs.astar.network/docs/build/dapp-staking/for-devs/create-promotion/"
+        target="_blank"
+        rel="noopener noreferrer"
+        >{{ $t('myReward.dappsOwnersLink') }}</a
+      >
     </div>
   </div>
 </template>
diff --git a/src/components/header/modals/ModalConnectWallet.vue b/src/components/header/modals/ModalConnectWallet.vue
index c20e26768..bef88052b 100644
--- a/src/components/header/modals/ModalConnectWallet.vue
+++ b/src/components/header/modals/ModalConnectWallet.vue
@@ -42,10 +42,10 @@
           <button
             v-for="(wallet, index) in nativeWallets"
             :key="index"
-            :disabled="checkIsDisabledWallet(wallet.source) || isZkEvm"
+            :disabled="isZkEvm"
             class="box__row--wallet box--hover--active"
             :class="currentWallet === wallet.source && 'border--active'"
-            @click="!checkIsDisabledWallet(wallet.source) && setSubstrateWalletModal(wallet.source)"
+            @click="setSubstrateWalletModal(wallet.source)"
           >
             <div class="box--img">
               <img :src="wallet.img" />
@@ -172,7 +172,6 @@ import { initiatePolkdatodSnap } from 'src/modules/snap';
 import { useStore } from 'src/store';
 import { SubstrateAccount } from 'src/store/general/state';
 import { PropType, computed, defineComponent, ref } from 'vue';
-import { productionOrigin } from 'src/links';
 
 export default defineComponent({
   props: {
@@ -224,13 +223,6 @@ export default defineComponent({
       props.setCloseModal();
     };
 
-    const checkIsDisabledWallet = (source: SupportWallet): boolean => {
-      if (source === SupportWallet.Snap && window.location.origin === productionOrigin) {
-        return true;
-      }
-      return false;
-    };
-
     const nativeWallets = computed(() => {
       return supportWallets
         .map((it) => {
@@ -327,7 +319,6 @@ export default defineComponent({
       setEvmWalletModal,
       disconnectAccount,
       setPolkasafeModal,
-      checkIsDisabledWallet,
       setAccountUnificationModal,
       currentNetworkIdx,
       endpointKey,
diff --git a/src/hooks/dapps-staking/useDispatchGetDapps.ts b/src/hooks/dapps-staking/useDispatchGetDapps.ts
index f05c9e0b9..f5c7479c3 100644
--- a/src/hooks/dapps-staking/useDispatchGetDapps.ts
+++ b/src/hooks/dapps-staking/useDispatchGetDapps.ts
@@ -6,7 +6,7 @@ import { computed, watch } from 'vue';
 export function useDispatchGetDapps() {
   const store = useStore();
   const { isZkEvm, networkNameSubstrate } = useNetworkInfo();
-  const { currentAccount } = useAccount();
+  const { senderSs58Account } = useAccount();
   const dapps = computed(() => store.getters['dapps/getAllDapps']);
 
   // Memo: invoke this function whenever the users haven't connect to wallets
@@ -17,30 +17,30 @@ export function useDispatchGetDapps() {
 
     const isBrowsingOnly = !!(
       dapps.value.length === 0 &&
-      !currentAccount.value &&
+      !senderSs58Account.value &&
       networkNameSubstrate.value
     );
 
     if (isBrowsingOnly || isZkEvm.value) {
       store.dispatch('dapps/getDapps', {
         network: networkNameSubstrate.value.toLowerCase(),
-        currentAccount: '',
+        senderSs58Account: '',
       });
     }
   };
 
   const getDapps = async (): Promise<void> => {
-    const isConnectedWallet = networkNameSubstrate.value && currentAccount.value;
+    const isConnectedWallet = networkNameSubstrate.value && senderSs58Account.value;
     if (isConnectedWallet && !isZkEvm.value) {
-      const address = !currentAccount.value ? '' : currentAccount.value;
+      const address = !senderSs58Account.value ? '' : senderSs58Account.value;
       store.dispatch('dapps/getDapps', {
         network: networkNameSubstrate.value.toLowerCase(),
-        currentAccount: address,
+        senderSs58Account: address,
       });
     } else {
       getDappsForBrowser();
     }
   };
 
-  watch([currentAccount, networkNameSubstrate], getDapps, { immediate: true });
+  watch([senderSs58Account, networkNameSubstrate], getDapps, { immediate: true });
 }
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 23a324afa..81c9b460c 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -289,7 +289,7 @@ export default {
       ledgerSPlus: 'Ledger Nano S Plus: 6 eras',
       ledgerS: 'Ledger Nano S: 2 eras',
     },
-    dappsOwners: 'dApps owners! We can now help to promote your campaign. Please check',
+    dappsOwners: 'DApps owners! We can now help to promote your campaign. Please check',
     dappsOwnersLink: 'the details.',
   },
   dappStaking: {
diff --git a/src/modules/snap/index.ts b/src/modules/snap/index.ts
index 9d89a88c0..2d1d58d52 100644
--- a/src/modules/snap/index.ts
+++ b/src/modules/snap/index.ts
@@ -19,7 +19,7 @@ export interface SnapConfig {
   unit?: UnitConfiguration;
 }
 
-export const snapId = process.env.DEV ? 'local:http://localhost:8081' : 'npm:@astar-network/snap';
+export const snapId = 'npm:@astar-network/snap';
 
 export async function enablePolkadotSnap(
   config: SnapConfig = { networkName: 'shibuya' },
diff --git a/src/store/dapp-staking/actions.ts b/src/store/dapp-staking/actions.ts
index 1b0ee8dc9..1fa7c4389 100644
--- a/src/store/dapp-staking/actions.ts
+++ b/src/store/dapp-staking/actions.ts
@@ -88,7 +88,7 @@ export const hasExtrinsicFailedEvent = (
 const actions: ActionTree<State, StateInterface> = {
   async getDapps(
     { commit, dispatch },
-    { network, currentAccount }: { network: string; currentAccount: string }
+    { network, senderSs58Account }: { network: string; senderSs58Account: string }
   ) {
     const accountUnificationService = container.get<IAccountUnificationService>(
       Symbols.AccountUnificationService
@@ -98,9 +98,9 @@ const actions: ActionTree<State, StateInterface> = {
       // Fetch dapps
       const dappsUrl = `${TOKEN_API_URL}/v1/${network.toLowerCase()}/dapps-staking/dappssimple`;
       const service = container.get<IDappStakingService>(Symbols.DappStakingService);
-      const address = isValidEvmAddress(currentAccount)
-        ? await accountUnificationService.getMappedNativeAddress(currentAccount)
-        : currentAccount;
+      const address = isValidEvmAddress(senderSs58Account)
+        ? await accountUnificationService.getMappedNativeAddress(senderSs58Account)
+        : senderSs58Account;
       const [dapps, combinedInfo] = await Promise.all([
         axios.get<DappItem[]>(dappsUrl),
         service.getCombinedInfo(address),