merge origin/develop

env.json

@@ -12,11 +12,11 @@
     "charts": true,
     "soraCard": false,
     "orderBook": true,
-    "kensetsu": false,
+    "kensetsu": true,
     "assetOwner": false
   },
   "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod",
-  "SUBSQUID_ENDPOINT": "",
+  "SUBSQUID_ENDPOINT": "https://squid.subsquid.io/sora/graphql",
   "DEFAULT_NETWORKS": [
     {
       "chain": "SORA",
@@ -57,6 +57,7 @@
     "Polkadot": true,
     "PolkadotSora": true,
     "PolkadotAcala": true,
+    "PolkadotAstar": true,
     "Liberland": true
   },
   "EVM_NETWORKS_IDS": [56, 8217],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.35.0",
+  "version": "1.38.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
@@ -28,7 +28,7 @@
   "dependencies": {
     "@cedelabs/widgets-universal": "^1.3.1",
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.35.2",
+    "@soramitsu/soraneo-wallet-web": "1.38.2",
     "@walletconnect/ethereum-provider": "^2.12.2",
     "@walletconnect/modal": "^2.6.2",
     "core-js": "^3.37.0",
@@ -40,6 +40,7 @@
     "ethers": "6.12.1",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
+    "polkadotApi": "npm:@polkadot/api@11.2.1",
     "uuidv4": "^6.2.13",
     "vue": "2.7.14",
     "vue-class-component": "^7.2.6",
@@ -99,7 +100,7 @@
   "resolutions": {
     "@polkadot/extension-dapp": "^0.44.7",
     "@polkadot/extension-inject": "^0.44.7",
-    "@polkadot/util": "^10.4.2",
+    "@polkadot/util": "^12.6.2",
     "ipfs-unixfs": "6.0.6",
     "ipfs-unixfs-exporter": "7.0.6",
     "ipfs-unixfs-importer": "9.0.6"

public/marketing.json

@@ -1,17 +1,24 @@
 [
+  {
+    "title": "SORA",
+    "img": "/marketing/soraV3.png",
+    "link": "https://medium.com/sora-xor/sora-v3-669d0619b141"
+  },
+  {
+    "title": "NEW LISTING - TON",
+    "img": "/marketing/ton.png",
+    "link": "/#/swap/XOR/TONCOIN"
+  },
   {
     "title": "GET SORA CARD",
     "img": "/marketing/card.png",
-    "link": "https://soracard.com"
+    "link": "https://soracard.com",
+    "right": "20px"
   },
   {
     "title": "CONNECT WITH GOOGLE",
     "img": "/marketing/google.png",
-    "link": "https://medium.com/polkaswap/how-to-use-connect-with-google-on-polkawap-a4f9ea2cd2f2"
-  },
-  {
-    "title": "LEARN ABOUT SYNTHETICS",
-    "img": "/marketing/synths.png",
-    "link": "https://medium.com/polkaswap/unveiling-synthetic-assets-a-game-changer-in-the-financial-landscape-1720e5858422"
+    "link": "https://medium.com/polkaswap/how-to-use-connect-with-google-on-polkawap-a4f9ea2cd2f2",
+    "right": "20px"
   }
 ]

src/App.vue

@@ -30,7 +30,13 @@
       {{ t('browserNotificationDialog.pointer') }}
     </notification-enabling-page>
     <alerts />
-    <confirm-dialog />
+    <confirm-dialog
+      :get-api="getApi"
+      :account="account"
+      :visibility="isSignTxDialogVisible"
+      :set-visibility="setSignTxDialogVisibility"
+    />
+    <select-sora-account-dialog />
   </s-design-system-provider>
 </template>
 
@@ -57,10 +63,8 @@ import AppMenu from '@/components/App/Menu/AppMenu.vue';
 import NodeErrorMixin from '@/components/mixins/NodeErrorMixin';
 import SoraLogo from '@/components/shared/Logo/Sora.vue';
 import { PageNames, Components, Language, WalletPermissions } from '@/consts';
-import { BreakpointClass, Breakpoint } from '@/consts/layout';
+import { BreakpointClass } from '@/consts/layout';
 import { getLocale } from '@/lang';
-import { isDashboardPage } from '@/modules/dashboard/router';
-import { isVaultPage } from '@/modules/vault/router';
 import router, { goTo, lazyComponent } from '@/router';
 import { action, getter, mutation, state } from '@/store/decorators';
 import { getMobileCssClasses, preloadFontFace, updateDocumentTitle } from '@/utils';
@@ -88,6 +92,7 @@ import type Theme from '@soramitsu-ui/ui-vue2/lib/types/Theme';
     AppBrowserNotifsBlockedDialog: lazyComponent(Components.AppBrowserNotifsBlockedDialog),
     ReferralsConfirmInviteUser: lazyComponent(Components.ReferralsConfirmInviteUser),
     BridgeTransferNotification: lazyComponent(Components.BridgeTransferNotification),
+    SelectSoraAccountDialog: lazyComponent(Components.SelectSoraAccountDialog),
     NotificationEnablingPage: components.NotificationEnablingPage,
     ConfirmDialog: components.ConfirmDialog,
   },
@@ -109,8 +114,8 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
   @state.router.loading pageLoading!: boolean;
 
   @getter.settings.nodeIsConnected nodeIsConnected!: boolean;
-  @getter.wallet.transactions.firstReadyTx private firstReadyTransaction!: Nullable<HistoryItem>;
-  @getter.wallet.account.isLoggedIn isSoraAccountConnected!: boolean;
+  @getter.wallet.transactions.firstReadyTx firstReadyTransaction!: Nullable<HistoryItem>;
+  @getter.wallet.account.isLoggedIn isLoggedIn!: boolean;
   @getter.libraryTheme libraryTheme!: Theme;
   @getter.libraryDesignSystem libraryDesignSystem!: DesignSystem;
 
@@ -147,6 +152,9 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
     message: string;
   }) => Promise<void>;
 
+  @state.wallet.transactions.isSignTxDialogVisible public isSignTxDialogVisible!: boolean;
+  @mutation.wallet.transactions.setSignTxDialogVisibility public setSignTxDialogVisibility!: (flag: boolean) => void;
+
   // [DESKTOP] To Enable Desktop
   // @mutation.wallet.account.setIsDesktop private setIsDesktop!: (v: boolean) => void;
 
@@ -174,7 +182,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
     }
   }
 
-  @Watch('isSoraAccountConnected')
+  @Watch('isLoggedIn')
   private async confirmInviteUserIfConnected(isSoraConnected: boolean): Promise<void> {
     if (isSoraConnected) {
       await this.confirmInvititation();
@@ -183,7 +191,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
 
   @Watch('storageReferrer', { immediate: true })
   private async confirmInviteUserIfHasStorage(storageReferrerValue: string): Promise<void> {
-    if (this.isSoraAccountConnected && !!storageReferrerValue) {
+    if (this.isLoggedIn && !!storageReferrerValue) {
       await this.confirmInvititation();
     }
   }
@@ -297,6 +305,10 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
     this.setBrowserNotifsPopupBlocked(value);
   }
 
+  getApi() {
+    return api;
+  }
+
   goTo(name: PageNames): void {
     goTo(name);
     this.closeMenu();