Fix notification links (#1092)

Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>
sora-xor · Jul 6, 2023 · b340cab · b340cab
1 parent 0e6b753
commit b340cab
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.17.17",
+    "@soramitsu/soraneo-wallet-web": "1.17.18",
     "@walletconnect/web3-provider": "^1.8.0",
     "base-64": "^1.0.0",
     "core-js": "^3.26.0",

diff --git a/src/App.vue b/src/App.vue
@@ -43,10 +43,10 @@
 </template>
 
 <script lang="ts">
-import { api, connection, components, mixins, settingsStorage } from '@soramitsu/soraneo-wallet-web';
+import { api, connection, components, mixins, settingsStorage, AlertsApiService } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins, Watch } from 'vue-property-decorator';
 
-import axiosInstance, { updateBaseUrl } from '@/api';
+import axiosInstance, { updateBaseUrl, getFullBaseUrl } from '@/api';
 import AppFooter from '@/components/App/Footer/AppFooter.vue';
 import AppHeader from '@/components/App/Header/AppHeader.vue';
 import AppMenu from '@/components/App/Menu/AppMenu.vue';
@@ -56,11 +56,11 @@ import { PageNames, Components, Language } from '@/consts';
 import { getLocale } from '@/lang';
 import router, { goTo, lazyComponent } from '@/router';
 import { action, getter, mutation, state } from '@/store/decorators';
-import type { FeatureFlags } from '@/store/settings/types';
-import type { EthBridgeSettings, SubNetworkApps } from '@/store/web3/types';
-import type { ConnectToNodeOptions, Node } from '@/types/nodes';
 import { preloadFontFace, updateDocumentTitle } from '@/utils';
 
+import type { FeatureFlags } from './store/settings/types';
+import type { EthBridgeSettings, SubNetworkApps } from './store/web3/types';
+import type { ConnectToNodeOptions, Node } from './types/nodes';
 import type { History, HistoryItem } from '@sora-substrate/util';
 import type { WhitelistArrayItem } from '@sora-substrate/util/build/assets/types';
 import type { EvmNetwork } from '@sora-substrate/util/build/bridgeProxy/evm/types';
@@ -195,6 +195,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
     preloadFontFace('element-icons');
 
     updateBaseUrl(router);
+    AlertsApiService.baseRoute = getFullBaseUrl(router);
 
     await this.setLanguage(getLocale() as Language);
 

diff --git a/src/api/index.ts b/src/api/index.ts
@@ -18,6 +18,21 @@ export const detectBaseUrl = (router?: VueRouter): string => {
   return '';
 };
 
+export function getRouterMode(router?: VueRouter) {
+  return router?.mode === 'hash' ? '#/' : '';
+}
+
+/**
+ * Returns `detectBaseUrl` + router mode like:
+ *
+ * polkaswap.io/#/
+ */
+export function getFullBaseUrl(router?: VueRouter): string {
+  const routerMode = getRouterMode(router);
+  const baseUrl = detectBaseUrl(router);
+  return baseUrl + routerMode;
+}
+
 export const updateBaseUrl = (router: VueRouter): void => {
   const baseUrl = detectBaseUrl(router);
   axiosInstance.defaults.baseURL = baseUrl;

diff --git a/src/views/ReferralProgram.vue b/src/views/ReferralProgram.vue
@@ -178,7 +178,7 @@ import { components, mixins, api, WALLET_TYPES, WALLET_CONSTS } from '@soramitsu
 import last from 'lodash/fp/last';
 import { Component, Mixins, Watch } from 'vue-property-decorator';
 
-import { detectBaseUrl } from '@/api';
+import { getFullBaseUrl, getRouterMode } from '@/api';
 import WalletConnectMixin from '@/components/mixins/WalletConnectMixin';
 import { PageNames, ZeroStringValue } from '@/consts';
 import router, { lazyView } from '@/router';
@@ -307,12 +307,8 @@ export default class ReferralProgram extends Mixins(
     return cssClasses;
   }
 
-  get routerMode(): string {
-    return router.mode === 'hash' ? '#/' : '';
-  }
-
   get linkHrefBase(): string {
-    return `${detectBaseUrl(router)}${this.routerMode}referral/`;
+    return `${getFullBaseUrl(router)}referral/`;
   }
 
   get referralLink() {
@@ -404,7 +400,8 @@ export default class ReferralProgram extends Mixins(
   }
 
   getLinkLabel(address: string): string {
-    return `<span class="referral-link-address">Polkaswap.io/</span>${this.routerMode}referral/${address}`;
+    const routerMode = getRouterMode(router);
+    return `<span class="referral-link-address">Polkaswap.io/</span>${routerMode}referral/${address}`;
   }
 
   getInvitedUserReward(invitedUser: string): string {

diff --git a/yarn.lock b/yarn.lock
@@ -2433,10 +2433,10 @@
     vue-property-decorator "^9.1.2"
     vuex "^3.6.2"
 
-"@soramitsu/soraneo-wallet-web@1.17.17":
-  version "1.17.17"
-  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.17.17.tgz#72d2040c8b369dbdb09f665646076e26a6a6c847"
-  integrity sha512-29c00pn6hAYJF7Nb0VKx6P6Q582H+SahCwXAs277K9FjmuBix7VuqMZQZ8WGaP7b31A6811AWeBbBaDcRS+xPQ==
+"@soramitsu/soraneo-wallet-web@1.17.18":
+  version "1.17.18"
+  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.17.18.tgz#c823223c3cc4650073d7afdc0ff7762ac7b6727e"
+  integrity sha512-FR9rhw38q1GsYPw0F7nQNJOTATynkHfFsSmnfG0JmGa1LdV34L+8ocIPObDGdYo0AAwDkkm+7wck66VZXn0cbQ==
   dependencies:
     "@polkadot/vue-identicon" "2.12.1"
     "@sora-substrate/util" "1.17.21"