soramitsu
diff --git a/‎package.json
Lines changed: 21 additions & 18 deletions b/‎package.json
Lines changed: 21 additions & 18 deletions
diff --git a/‎public/env.json
Lines changed: 1 addition & 1 deletion b/‎public/env.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/components/pages/OrderBook/BuySell.vue
Lines changed: 16 additions & 10 deletions b/‎src/components/pages/OrderBook/BuySell.vue
Lines changed: 16 additions & 10 deletions
@@ -1,10 +1,13 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
   },
+  "engines": {
+    "node": ">=20"
+  },
   "license": "Apache-2.0",
   "private": true,
   "author": "[email protected] <[email protected]>",
@@ -24,34 +27,34 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.30.0",
-    "@walletconnect/ethereum-provider": "^2.11.0",
+    "@soramitsu/soraneo-wallet-web": "1.32.4",
+    "@walletconnect/ethereum-provider": "^2.11.2",
     "@walletconnect/modal": "^2.6.2",
-    "core-js": "^3.33.2",
+    "core-js": "^3.36.0",
     "country-code-emoji": "^2.3.0",
-    "country-flag-emoji-polyfill": "^0.1.4",
+    "country-flag-emoji-polyfill": "^0.1.8",
     "direct-vuex": "^0.12.1",
-    "echarts": "^5.4.3",
+    "echarts": "^5.5.0",
     "email-validator": "^2.0.4",
     "ethers": "6.8.0",
-    "jwt-decode": "^3.1.2",
+    "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
     "uuidv4": "^6.2.13",
     "vue": "2.7.14",
     "vue-class-component": "^7.2.6",
-    "vue-echarts": "^6.3.3",
+    "vue-echarts": "^6.6.9",
     "vue-i18n": "^8.28.2",
     "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@babel/runtime": "^7.23.2",
-    "@types/electron-devtools-installer": "^2.2.3",
-    "@types/jest": "^29.5.5",
-    "@types/jsdom": "^21.1.3",
-    "@types/lodash": "^4.14.199",
-    "@types/node": "^20.8.4",
+    "@babel/runtime": "^7.23.9",
+    "@types/electron-devtools-installer": "^2.2.5",
+    "@types/jest": "^29.5.12",
+    "@types/jsdom": "^21.1.6",
+    "@types/lodash": "^4.14.202",
+    "@types/node": "^20.11.21",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "@vue/cli-plugin-babel": "5.0.8",
@@ -81,12 +84,12 @@
     "jest": "^27.5.1",
     "jsdom": "^16.7.0",
     "lint-staged": "^9.5.0",
-    "node-polyfill-webpack-plugin": "^2.0.1",
+    "node-polyfill-webpack-plugin": "^3.0.0",
     "prettier": "^2.8.8",
-    "sass": "^1.66.1",
-    "sass-loader": "^13.3.2",
+    "sass": "^1.71.1",
+    "sass-loader": "^14.1.1",
     "ts-jest": "^27.1.5",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "vue-cli-plugin-electron-builder": "^3.0.0-alpha.4",
     "vue-cli-plugin-test-attrs": "^0.1.5",
     "vue-template-compiler": "2.7.14"
 
@@ -35,7 +35,7 @@
       "address": "wss://ws.framenode-3.r0.dev.sora2.soramitsu.co.jp"
     }
   ],
-  "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod",
+  "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-dev",
   "SUBSQUID_ENDPOINT": "https://squid.subsquid.io/sora-dev/v/v1/graphql",
   "NETWORK_TYPE": "Dev",
   "CHAIN_GENESIS_HASH": "",
 
@@ -823,21 +823,27 @@ export default class BuySellWidget extends Mixins(TranslationMixin, mixins.Forma
   }
 
   private subscribeOnBookQuote(): void {
-    if (!this.baseValue) return;
     this.resetQuoteSubscription();
 
-    if (!this.areTokensSelected) return;
+    if (!(this.baseValue && this.areTokensSelected)) return;
 
-    const observableQuote = api.swap.subscribeOnResultRpc(
-      (this.tokenFrom as AccountAsset).address,
-      (this.tokenTo as AccountAsset).address,
-      this.baseValue,
-      this.isBuySide,
-      LiquiditySourceTypes.OrderBook
+    const inputAsset = (this.tokenFrom as AccountAsset).address;
+    const outputAsset = (this.tokenTo as AccountAsset).address;
+    const sources = [LiquiditySourceTypes.OrderBook];
+
+    const observableQuote = api.swap.getSwapQuoteObservable(
+      inputAsset,
+      outputAsset,
+      sources,
+      DexId.XOR // subscription only for XOR dex in optimization purposes
     );
 
-    this.quoteSubscription = observableQuote.subscribe(async (quoteData) => {
-      const { amount } = await quoteData;
+    if (!observableQuote) return;
+
+    this.quoteSubscription = observableQuote.subscribe(async ({ quote }) => {
+      const {
+        result: { amount },
+      } = quote(inputAsset, outputAsset, this.baseValue, this.isBuySide, sources);
 
       if (FPNumber.fromCodecValue(amount).isZero() || this.limitOrderType === LimitOrderType.limit) {
         this.resetQuoteSubscription();
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`"address": "wss://ws.framenode-3.r0.dev.sora2.soramitsu.co.jp"`
`36`	`36`	`}`
`37`	`37`	`],`
`38`		`- "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod",`
	`38`	`+ "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-dev",`
`39`	`39`	`"SUBSQUID_ENDPOINT": "https://squid.subsquid.io/sora-dev/v/v1/graphql",`
`40`	`40`	`"NETWORK_TYPE": "Dev",`
`41`	`41`	`"CHAIN_GENESIS_HASH": "",`