diff --git a/package.json b/package.json index f5b157bff..64e7a9361 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@types/jsdom": "^21.1.7", "@types/lodash": "^4.17.6", "@types/node": "^20.14.10", - "@types/telegram-web-app": "^7.3.1", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "@vue/cli-plugin-babel": "5.0.8", diff --git a/public/marketing.json b/public/marketing.json index d1c2f13e3..077ff3791 100644 --- a/public/marketing.json +++ b/public/marketing.json @@ -4,11 +4,6 @@ "img": "/marketing/polkaswap.png", "link": "https://about.polkaswap.io" }, - { - "title": "NOW IN TELEGRAM", - "img": "/marketing/now_in_telegram.png", - "link": "https://t.me/polkaswap_io_bot/app" - }, { "title": "SORA", "img": "/marketing/soraV3.png", diff --git a/src/App.vue b/src/App.vue index b61886619..9114cfc79 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,8 +31,6 @@ { window.removeEventListener('localStorageUpdated', this.handleLocalStorageChange); window.removeEventListener('resize', this.setResponsiveClassDebounced); - tmaSdkService.destroy(); + // tmaSdkService.destroy(); await this.resetInternalSubscriptions(); await this.resetNetworkSubscriptions(); this.resetBlockNumberSubscription(); diff --git a/src/components/App/Header/AppHeaderMenu.vue b/src/components/App/Header/AppHeaderMenu.vue index 4d721b9bd..28a2a6bb4 100644 --- a/src/components/App/Header/AppHeaderMenu.vue +++ b/src/components/App/Header/AppHeaderMenu.vue @@ -43,7 +43,7 @@ import { Component, Mixins } from 'vue-property-decorator'; import TranslationMixin from '@/components/mixins/TranslationMixin'; import { getter, mutation, state } from '@/store/decorators'; -import { tmaSdkService } from '@/utils/telegram'; +// import { tmaSdkService } from '@/utils/telegram'; import type { Currency } from '@soramitsu/soraneo-wallet-web/lib/types/currency'; @@ -186,7 +186,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) { case HeaderMenuType.Theme: await switchTheme(); await this.$nextTick(); - tmaSdkService.updateTheme(); + // tmaSdkService.updateTheme(); break; case HeaderMenuType.Language: this.setLanguageDialogVisibility(true); diff --git a/src/indexer/queries/burnXor.ts b/src/indexer/queries/burnXor.ts index 500603f66..89889205f 100644 --- a/src/indexer/queries/burnXor.ts +++ b/src/indexer/queries/burnXor.ts @@ -155,37 +155,6 @@ const getSubsquidXorBurnQuery = (address?: string) => gql>` - query XorBurnQuery($start: Int = 0, $end: Int = 0, $after: String = null, $first: Int = 100) { - data: historyElementsConnection( - orderBy: id_ASC - first: $first - after: $after - where: { - AND: [ - { blockHeight_gte: $start } - { blockHeight_lte: $end } - { module_eq: "assets" } - { method_eq: "burn" } - { data_jsonContains: { assetId: "0x0200000000000000000000000000000000000000000000000000000000000000" } } - ] - } - ) { - pageInfo { - hasNextPage - endCursor - } - edges { - node { - address - data - blockHeight - } - } - } - } -`; - const parse = (item: HistoryElement): XorBurn => { const data = item.data as HistoryElementAssetBurn; diff --git a/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue b/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue index ad61b173d..b31f19eb8 100644 --- a/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue +++ b/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue @@ -212,6 +212,7 @@ export default class ReviewDetails extends Mixins(mixins.TransactionMixin, mixin @getter.routeAssets.isLiquidityUnavailable isLiquidityUnavailable!: boolean; @getter.wallet.account.assetsDataTable private assetsDataTable!: WALLET_TYPES.AssetsTable; @getter.routeAssets.adarSwapEnabled adarSwapEnabled!: boolean; + @getter.routeAssets.transferTokenBalance transferTokenBalance!: (address: string | undefined) => FPNumber; showSwapDialog = false; showSelectInputAssetDialog = false; @@ -310,8 +311,7 @@ export default class ReviewDetails extends Mixins(mixins.TransactionMixin, mixin } tokenTransferAmountRequired(asset: Asset, requiredValue: FPNumber) { - const userAssetBalanceString = this.getTokenBalance(asset); - const userAssetBalance = FPNumber.fromCodecValue(userAssetBalanceString, asset.decimals); + const userAssetBalance = this.transferTokenBalance(asset.address); return requiredValue.sub(userAssetBalance); } diff --git a/src/modules/ADAR/components/RouteAssets/SwapDialog.vue b/src/modules/ADAR/components/RouteAssets/SwapDialog.vue index 70ad54328..920e545fa 100644 --- a/src/modules/ADAR/components/RouteAssets/SwapDialog.vue +++ b/src/modules/ADAR/components/RouteAssets/SwapDialog.vue @@ -1,9 +1,7 @@