sora-xor · stefashkaa · Dec 9, 2022 · Dec 9, 2022 · Dec 9, 2022 · Dec 9, 2022
diff --git a/env.json b/env.json
@@ -10,7 +10,7 @@
         "charts": true,
         "soraCard": false
     },
-    "SUBQUERY_ENDPOINT": "https://subquery2.q1.sora2.soramitsu.co.jp",
+    "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod-sub4",
     "DEFAULT_NETWORKS": [
         {
             "chain": "SORA",

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.11.6",
+    "@soramitsu/soraneo-wallet-web": "1.11.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "base-64": "^1.0.0",
     "core-js": "^3.26.0",

diff --git a/src/components/SelectAsset/SelectToken.vue b/src/components/SelectAsset/SelectToken.vue
@@ -1,6 +1,6 @@
 <template>
   <dialog-base :visible.sync="isVisible" :title="t('selectToken.title')" custom-class="asset-select">
-    <s-tabs v-model="tabValue" class="s-tabs--exchange" type="rounded" @click="handleTabClick">
+    <s-tabs :value="tabValue" class="s-tabs--exchange" type="rounded" @input="handleTabChange">
       <search-input
         ref="search"
         v-model="query"
@@ -106,7 +106,7 @@ export default class SelectToken extends Mixins(TranslationMixin, SelectAssetMix
   @action.wallet.account.addAsset private addAsset!: (address?: string) => Promise<void>;
 
   @Watch('visible')
-  async handleTabChange(value: boolean): Promise<void> {
+  async handleTabReset(value: boolean): Promise<void> {
     if (!value) return;
 
     this.tabValue = first(this.tokenTabs);
@@ -179,7 +179,7 @@ export default class SelectToken extends Mixins(TranslationMixin, SelectAssetMix
     api.assets.removeAccountAsset(asset.address);
   }
 
-  handleTabClick({ name }): void {
+  handleTabChange(name: Tabs): void {
     this.tabValue = name;
     this.handleClearSearch();
   }

diff --git a/src/components/Settings/MarketAlgorithm.vue b/src/components/Settings/MarketAlgorithm.vue
@@ -6,7 +6,7 @@
         <span>{{ t('dexSettings.marketAlgorithmTooltip.main') }}</span>
       </div>
     </settings-header>
-    <settings-tabs :value="currentMarketAlgorithm" :tabs="marketAlgorithmTabs" @click="selectTab" />
+    <settings-tabs :value="currentMarketAlgorithm" :tabs="marketAlgorithmTabs" @input="selectTab" />
   </div>
 </template>
 
@@ -53,7 +53,7 @@ export default class MarketAlgorithm extends Mixins(TranslationMixin) {
     return `<span class="algorithm">${type}</span>`;
   }
 
-  selectTab({ name }): void {
+  selectTab(name: MarketAlgorithms): void {
     this.setMarketAlgorithm(name);
   }
 }

diff --git a/src/components/Settings/SlippageTolerance.vue b/src/components/Settings/SlippageTolerance.vue
@@ -11,7 +11,7 @@
         </template>
         <div :class="slippageToleranceClasses">
           <div class="slippage-tolerance-default">
-            <settings-tabs :value="slippageTolerance" :tabs="SlippageToleranceTabs" @click="selectTab" />
+            <settings-tabs :value="slippageTolerance" :tabs="SlippageToleranceTabs" @input="selectTab" />
           </div>
           <div class="slippage-tolerance-custom">
             <s-float-input
@@ -126,7 +126,7 @@ export default class SlippageTolerance extends Mixins(mixins.NumberFormatterMixi
     return '';
   }
 
-  selectTab({ name }): void {
+  selectTab(name: string): void {
     this.setSlippageTolerance(name);
   }
 

diff --git a/src/components/Swap/Chart.vue b/src/components/Swap/Chart.vue
@@ -10,7 +10,7 @@
           </div>
         </div>
         <div class="chart-filters">
-          <s-tabs type="rounded" :value="selectedFilter.name" @click="selectFilter">
+          <s-tabs type="rounded" :value="selectedFilter.name" @input="selectFilter">
             <s-tab
               v-for="filter in filters"
               :key="filter.name"
@@ -877,7 +877,7 @@ export default class SwapChart extends Mixins(
     this.subscribeToPriceUpdates();
   }
 
-  selectFilter({ name }): void {
+  selectFilter(name: string): void {
     const filter = this.filters.find((item) => item.name === name);
 
     if (!filter) return;

diff --git a/src/modules/demeterFarming/components/CalculatorDialog.vue b/src/modules/demeterFarming/components/CalculatorDialog.vue
@@ -37,7 +37,7 @@
 
       <div class="duration">
         <info-line label="Duration" class="duration-title" />
-        <s-tabs type="rounded" :value="selectedPeriod" @click="selectPeriod" class="duration-tabs">
+        <s-tabs type="rounded" :value="selectedPeriod" @input="selectPeriod" class="duration-tabs">
           <s-tab v-for="period in intervals" :key="period" :name="String(period)" :label="`${period}D`" />
         </s-tabs>
       </div>
@@ -174,7 +174,7 @@ export default class CalculatorDialog extends Mixins(StakeDialogMixin) {
     return new FPNumber(this.calculatedRoiPercent.toFixed(2)).toLocaleString() + '%';
   }
 
-  selectPeriod({ name }): void {
+  selectPeriod(name: string): void {
     this.interval = Number(name);
   }
 

diff --git a/src/modules/demeterFarming/components/ClaimDialog.vue b/src/modules/demeterFarming/components/ClaimDialog.vue
@@ -35,6 +35,7 @@
       <s-button
         type="primary"
         class="s-typography-button--large action-button"
+        :loading="parentLoading"
         :disabled="isInsufficientXorForFee"
         @click="confirm"
       >
@@ -64,7 +65,12 @@ import TranslationMixin from '@/components/mixins/TranslationMixin';
     FormattedAmount: components.FormattedAmount,
   },
 })
-export default class ClaimDialog extends Mixins(AccountPoolMixin, TranslationMixin, mixins.DialogMixin) {
+export default class ClaimDialog extends Mixins(
+  AccountPoolMixin,
+  TranslationMixin,
+  mixins.DialogMixin,
+  mixins.LoadingMixin
+) {
   readonly FontSizeRate = WALLET_CONSTS.FontSizeRate;
 
   confirm(): void {

diff --git a/src/modules/demeterFarming/components/StakeDialog.vue b/src/modules/demeterFarming/components/StakeDialog.vue
@@ -96,6 +96,7 @@
       <s-button
         type="primary"
         class="s-typography-button--large action-button"
+        :loading="parentLoading"
         :disabled="isInsufficientXorForFee || valueFundsEmpty || isInsufficientBalance"
         @click="handleConfirm"
       >

diff --git a/src/modules/demeterFarming/mixins/StakeDialogMixin.ts b/src/modules/demeterFarming/mixins/StakeDialogMixin.ts
@@ -7,7 +7,7 @@ import PoolMixin from './PoolMixin';
 import type { CodecString } from '@sora-substrate/util';
 
 @Component
-export default class StakeDialogMixin extends Mixins(PoolMixin, mixins.DialogMixin) {
+export default class StakeDialogMixin extends Mixins(PoolMixin, mixins.DialogMixin, mixins.LoadingMixin) {
   @Prop({ default: () => true, type: Boolean }) readonly isAdding!: boolean;
 
   get networkFee(): CodecString {

diff --git a/src/modules/demeterFarming/views/Pool.vue b/src/modules/demeterFarming/views/Pool.vue
@@ -37,13 +37,15 @@
       :pool="selectedPool"
       :account-pool="selectedAccountPool"
       :is-adding="isAddingStake"
+      :parent-loading="parentLoading || loading"
       @add="handleStakeAction($event, deposit)"
       @remove="handleStakeAction($event, withdraw)"
     />
     <claim-dialog
       :visible.sync="showClaimDialog"
       :pool="selectedPool"
       :account-pool="selectedAccountPool"
+      :parent-loading="parentLoading || loading"
       @confirm="handleClaimRewards"
     />
 

diff --git a/src/modules/demeterFarming/views/Staking.vue b/src/modules/demeterFarming/views/Staking.vue
@@ -50,13 +50,15 @@
       :pool="selectedPool"
       :account-pool="selectedAccountPool"
       :is-adding="isAddingStake"
+      :parent-loading="parentLoading || loading"
       @add="handleStakeAction($event, deposit)"
       @remove="handleStakeAction($event, withdraw)"
     />
     <claim-dialog
       :visible.sync="showClaimDialog"
       :pool="selectedPool"
       :account-pool="selectedAccountPool"
+      :parent-loading="parentLoading || loading"
       @confirm="handleClaimRewards"
     />
     <calculator-dialog :visible.sync="showCalculatorDialog" :pool="selectedPool" :account-pool="selectedAccountPool" />

diff --git a/src/views/AddLiquidity.vue b/src/views/AddLiquidity.vue
@@ -89,7 +89,7 @@
 
     <confirm-token-pair-dialog
       :visible.sync="showConfirmDialog"
-      :parent-loading="parentLoading"
+      :parent-loading="parentLoading || loading"
       :share-of-pool="shareOfPool"
       :first-token="firstToken"
       :second-token="secondToken"

diff --git a/src/views/ReferralProgram.vue b/src/views/ReferralProgram.vue
@@ -149,7 +149,7 @@
             <p class="referrer-description" v-html="t('referralProgram.referrer.description')" />
           </template>
           <s-card v-if="referrer" shadow="always" size="small" border-radius="medium">
-            <div class="referrer-link-details">
+            <div class="referrer-link-details with-referrer">
               <div class="referral-link-label">{{ t('referralProgram.referrer.referredLablel') }}</div>
               <div class="referral-link" v-html="referrerLink.label" />
             </div>
@@ -709,9 +709,11 @@ export default class ReferralProgram extends Mixins(
     &-details {
       display: flex;
       flex-direction: column;
-      margin-right: $inner-spacing-mini;
-      overflow: hidden;
       color: var(--s-color-theme-accent);
+      &.with-referrer {
+        margin-right: $inner-spacing-mini;
+        overflow: hidden;
+      }
     }
     &,
     &-label {

diff --git a/src/views/RemoveLiquidity.vue b/src/views/RemoveLiquidity.vue
@@ -109,7 +109,7 @@
 
     <confirm-remove-liquidity
       :visible.sync="showConfirmDialog"
-      :parent-loading="parentLoading"
+      :parent-loading="parentLoading || loading"
       @confirm="handleConfirmRemoveLiquidity"
     />
 

diff --git a/src/views/RewardsTabs.vue b/src/views/RewardsTabs.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container rewards-tabs">
-    <s-tabs :value="currentTab" type="card" @change="handleChangeTab">
+    <s-tabs :value="currentTab" type="card" @input="handleChangeTab">
       <s-tab
         v-for="rewardsTab in RewardsTabsItems"
         :key="rewardsTab"

diff --git a/yarn.lock b/yarn.lock
@@ -2395,10 +2395,10 @@
     crypto-js "^4.0.0"
     lodash "^4.17.15"
 
-"@soramitsu/soramitsu-js-ui@^1.0.41":
-  version "1.0.41"
-  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soramitsu-js-ui/-/soramitsu-js-ui-1.0.41.tgz#77b480c6ac8b06e7d0575d73e4275a98339090df"
-  integrity sha512-qL/2UKYMEtp7DFdyRIsohAHBawmq5akjIeqAruMeOX5ZPMaKRIsP6mmRCNZieGgKMUQMdWEfHDtcgpkD0HQXCA==
+"@soramitsu/soramitsu-js-ui@^1.0.42":
+  version "1.0.42"
+  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soramitsu-js-ui/-/soramitsu-js-ui-1.0.42.tgz#adbafccb428d0351e95640d3f3ce011805e3461b"
+  integrity sha512-F8JFQb8hixDgKWSWLXdg7EkU5Y4YiisONJLEL/+D7Q8s1//3L+FLyRCsWu4l9Q/BZ6jbWUjAGDTcwZ8Rxsd0Nw==
   dependencies:
     core-js "^3.26.1"
     element-resize-detector "^1.2.4"
@@ -2412,14 +2412,14 @@
     vue-property-decorator "^9.1.2"
     vuex "^3.6.2"
 
-"@soramitsu/soraneo-wallet-web@1.11.6":
-  version "1.11.6"
-  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.11.6.tgz#c30f0553e808e6c6fbcf3ff64a9011c86b4df73d"
-  integrity sha512-FRuDh3evltsd+NG2PujrbUH5eUpxb5uLbwTrfAXrI5aI+tcZitF4Cwf6Y8RzAg7jPOSMuAcrQ1iD5F3WVrHOsg==
+"@soramitsu/soraneo-wallet-web@1.11.7":
+  version "1.11.7"
+  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.11.7.tgz#c82e8a168e483d5e43782ac3325cde0902e6f68b"
+  integrity sha512-W4qIQ2o6yZM7Kk9EWG4UdvsKFggGQoVh1DjeDgT1+jXeLY8hZyPh17oPyIxnZ/2Mlot9SAUdFJFzBs6R3mhhgw==
   dependencies:
     "@polkadot/vue-identicon" "2.6.1"
     "@sora-substrate/util" "1.11.17"
-    "@soramitsu/soramitsu-js-ui" "^1.0.41"
+    "@soramitsu/soramitsu-js-ui" "^1.0.42"
     "@subwallet/wallet-connect" "^0.2.3"
     "@urql/core" "^3.0.5"
     "@zxing/browser" "^0.1.1"