From 5973a75ea4fd1bace73f6bc8a621c6e84dc944d5 Mon Sep 17 00:00:00 2001
From: Stefan Popov <stefanpopov@list.ru>
Date: Wed, 12 Oct 2022 14:29:52 +0500
Subject: [PATCH 1/4] Fix wallet send paddings

---
 src/views/Wallet.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Wallet.vue b/src/views/Wallet.vue
index dd9606a8c..c1e2633d3 100644
--- a/src/views/Wallet.vue
+++ b/src/views/Wallet.vue
@@ -79,6 +79,7 @@ export default class Wallet extends Mixins(TranslationMixin) {
 
 <style lang="scss">
 .container--wallet {
+  padding: 0;
   > .el-card {
     &__header {
       padding-top: 0;

From 7c9663531bf04068c071a86bb3a8df74d3302719 Mon Sep 17 00:00:00 2001
From: Stefan Popov <stefanpopov@list.ru>
Date: Wed, 12 Oct 2022 14:30:19 +0500
Subject: [PATCH 2/4] Fix zero fiat values when subquery is down

---
 src/components/Input/TokenInput.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Input/TokenInput.vue b/src/components/Input/TokenInput.vue
index a147cc026..867e02fc9 100644
--- a/src/components/Input/TokenInput.vue
+++ b/src/components/Input/TokenInput.vue
@@ -26,6 +26,7 @@
               with-left-shift
               value-class="input-value--primary"
               :value="formattedBalance"
+              :has-fiat-value="tokenPrice"
               :fiat-value="formattedFiatBalance"
             />
           </template>

From 713cd3a585bc1023bdb544f24d3cc9550a85c9c8 Mon Sep 17 00:00:00 2001
From: Stefan Popov <stefanpopov@list.ru>
Date: Wed, 12 Oct 2022 15:51:07 +0500
Subject: [PATCH 3/4] Fix zero fiat when subquery is down for rewards header

---
 package.json                            |  2 +-
 src/components/Rewards/AmountHeader.vue | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 1b2112b81..6c6e4ab01 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^1.2.0",
-    "@soramitsu/soraneo-wallet-web": "1.10.31",
+    "@soramitsu/soraneo-wallet-web": "1.10.32",
     "@walletconnect/web3-provider": "^1.6.6",
     "core-js": "^3.6.4",
     "direct-vuex": "^0.12.1",
diff --git a/src/components/Rewards/AmountHeader.vue b/src/components/Rewards/AmountHeader.vue
index 0b51402ec..17a218fb5 100644
--- a/src/components/Rewards/AmountHeader.vue
+++ b/src/components/Rewards/AmountHeader.vue
@@ -10,7 +10,7 @@
         :asset-symbol="asset.symbol"
       />
     </div>
-    <formatted-amount is-fiat-value value-can-be-hidden :value="totalFiatValue" />
+    <formatted-amount v-if="totalFiatValue" is-fiat-value value-can-be-hidden :value="totalFiatValue" />
   </div>
 </template>
 
@@ -18,6 +18,7 @@
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 import { mixins, components, WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web';
 import type { Asset } from '@sora-substrate/util/build/assets/types';
+import type { FPNumber } from '@sora-substrate/math';
 
 import { RewardsAmountHeaderItem } from '@/types/rewards';
 
@@ -31,8 +32,8 @@ export default class AmountHeader extends Mixins(mixins.FormattedAmountMixin, mi
 
   @Prop({ default: () => [], type: Array }) items!: Array<RewardsAmountHeaderItem>;
 
-  get totalFiatValue(): string {
-    const value = this.items.reduce((result, item) => {
+  get totalFiatValue(): Nullable<string> {
+    const value = this.items.reduce<Nullable<FPNumber>>((result, item) => {
       if (!item.amount || !item.asset) return result;
 
       const fpAmount = this.getFPNumber(item.amount);
@@ -41,10 +42,17 @@ export default class AmountHeader extends Mixins(mixins.FormattedAmountMixin, mi
 
       const fpFiatAmount = this.getFPNumberFiatAmountByFPNumber(fpAmount, item.asset as Asset);
 
-      return fpFiatAmount ? result.add(fpFiatAmount) : result;
-    }, this.Zero);
-
-    return value.toLocaleString();
+      if (fpFiatAmount) {
+        if (!result) {
+          result = this.Zero;
+        }
+        return result.add(fpFiatAmount);
+      } else {
+        return result;
+      }
+    }, null);
+
+    return value?.toLocaleString();
   }
 }
 </script>

From 4e9c16d5729c2c122e4242420b56bed73a18768a Mon Sep 17 00:00:00 2001
From: Stefan Popov <stefanpopov@list.ru>
Date: Wed, 12 Oct 2022 16:12:01 +0500
Subject: [PATCH 4/4] Update yarn.lock

---
 yarn.lock | 72 +++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 22fce02e8..ebffd2d7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2368,60 +2368,60 @@
   resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87"
   integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==
 
-"@sora-substrate/api@1.10.10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@sora-substrate/api/-/api-1.10.10.tgz#1fcafd1a89756aa67e3681365748e8589d5290ad"
-  integrity sha512-s1tuWf3K9AFk7hMQuo2mV9bUB+HBmsc91RH/XJDagcg/c/PuWuNnw34NMV6+eYfos81lNMsqgU90f0PN5I5B5w==
+"@sora-substrate/api@1.10.13":
+  version "1.10.13"
+  resolved "https://registry.yarnpkg.com/@sora-substrate/api/-/api-1.10.13.tgz#d4a1b28d78d9e3f5d6fb1f092748986a861db71a"
+  integrity sha512-Vtmy9dKfMmjcsBpvsS59zmgPDN8bH4Jpb2hI82W+4yz8q8AXEg0r5s3ssdUiq3LjVf/+1ikAfgt0k3ydDuH/jQ==
   dependencies:
     "@open-web3/orml-api-derive" "0.9.4-26"
     "@polkadot/api" "8.9.1"
-    "@sora-substrate/types" "1.10.10"
+    "@sora-substrate/types" "1.10.13"
 
-"@sora-substrate/liquidity-proxy@1.10.10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@sora-substrate/liquidity-proxy/-/liquidity-proxy-1.10.10.tgz#5de5d50c2d6fe6618c4ef8a8030157ede2b3a1e7"
-  integrity sha512-OuocWICL63FMhW3Oz3sVit55ERGOv/5shCGVKL1LcxPPg09Iy1XHaWaJU+Rl+Zi5F6syXyiZ6e6AFB4ro1LTRA==
+"@sora-substrate/liquidity-proxy@1.10.13":
+  version "1.10.13"
+  resolved "https://registry.yarnpkg.com/@sora-substrate/liquidity-proxy/-/liquidity-proxy-1.10.13.tgz#a6a1486a9c5879501ea39ecf34d143bdd73d58ce"
+  integrity sha512-LIDiBLeCQANznTiM21ISdDqdkRghLyqaS4eXAUfaVZjphzbazJ+kgdMM5Y+RtEw72pJwu65g/I6mcMkON0bNLg==
   dependencies:
-    "@sora-substrate/math" "1.10.10"
+    "@sora-substrate/math" "1.10.13"
 
-"@sora-substrate/math@1.10.10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@sora-substrate/math/-/math-1.10.10.tgz#b28ac4f6a2bd4d01c4dc903137aed94e53be62ac"
-  integrity sha512-DAaUEg/aGXOjTR7zosSxHeyssrhgPeLEh61aHsOXQRxQwHaSA6gIw+8tgnVDjZOFJgycwDEcaemwPYlheU2hww==
+"@sora-substrate/math@1.10.13":
+  version "1.10.13"
+  resolved "https://registry.yarnpkg.com/@sora-substrate/math/-/math-1.10.13.tgz#d8ed5093dbea342a32b7d1ac83c026b1faef4159"
+  integrity sha512-fXRiJa86oP2Hu3UZBjlnSGmze+B+HPRNq/NlU1JwYUnc/P4jNnvzDWfoRugxruNa7lhusWdNboSfa1LOPCKtXA==
   dependencies:
     "@polkadot/types" "8.9.1"
     bignumber.js "^9.0.1"
     lodash "^4.17.15"
 
-"@sora-substrate/type-definitions@1.10.10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-1.10.10.tgz#7aa2c8f8ee2f855a12427ed5a609f9c1382c01dc"
-  integrity sha512-v6l7Tkt4P36p2Y/TwgNz4PJGfUuIH4VRcS1eimkAu9+w+T8aaqr5EK0bvWN50kMMCllLRjsFRjQGStnymINTyA==
+"@sora-substrate/type-definitions@1.10.13":
+  version "1.10.13"
+  resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-1.10.13.tgz#0634a4b4cb192b3456726265cb11c6aa81481388"
+  integrity sha512-F4dVSbvCq5f+t6I3PFF7aMP+2SN1QayqmYdW2ggZ/H2Nc0ao7Gg95ftFpxdig715VnatJl4KWGYo4wqUg+Zz/w==
   dependencies:
     "@open-web3/orml-type-definitions" "0.9.4-26"
 
-"@sora-substrate/types@1.10.10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@sora-substrate/types/-/types-1.10.10.tgz#41a04b9ef8d11cd5dc827e98a5f75902e6fcf8db"
-  integrity sha512-wuRA5YT8SAeLdST4tX9WmtP7smzTB+/Xwfwpn1uXTYotXspyrYUTZmkoUqMxz45WxyPeR3y+YbjKjHb5w+fopA==
+"@sora-substrate/types@1.10.13":
+  version "1.10.13"
+  resolved "https://registry.yarnpkg.com/@sora-substrate/types/-/types-1.10.13.tgz#4fd1a4da20cd3f1c9ed07ad89e330ac9dd4a122a"
+  integrity sha512-d2Hrhy+epFJuKqkq/+RoDc+Ib2uS/0bd+l5DeT853poONOS1y5xkNm6fh1+XxqCxhf8WeJs0rckcvzngjg4s0A==
   dependencies:
     "@open-web3/api-mobx" "0.9.4-26"
     "@open-web3/orml-types" "0.9.4-26"
     "@polkadot/api" "8.9.1"
     "@polkadot/typegen" "8.9.1"
     "@polkadot/types" "8.9.1"
-    "@sora-substrate/type-definitions" "1.10.10"
+    "@sora-substrate/type-definitions" "1.10.13"
 
-"@sora-substrate/util@1.10.10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@sora-substrate/util/-/util-1.10.10.tgz#7b28e68174daeb0f9466f00290c844c49109ec38"
-  integrity sha512-J5GaInCkelnefr4506TCrevw3xSBXXBpXLjmUPMcjtLjsfPwHVIqpVgTSceCCKh0q0A1ypKYS+2BKVMdGBXYNQ==
+"@sora-substrate/util@1.10.13":
+  version "1.10.13"
+  resolved "https://registry.yarnpkg.com/@sora-substrate/util/-/util-1.10.13.tgz#5296f331673fadafb1bba4057fafb88957b7e341"
+  integrity sha512-Mp9wH7T60nw4MswvfX3GoGGyhqCApOqfgXHNezSKChADsIwWcqgVZcTkOT8snH4hzNZ55aTZu1mHK9EivDcZpA==
   dependencies:
     "@polkadot/ui-keyring" "2.5.1"
-    "@sora-substrate/api" "1.10.10"
-    "@sora-substrate/liquidity-proxy" "1.10.10"
-    "@sora-substrate/math" "1.10.10"
-    "@sora-substrate/types" "1.10.10"
+    "@sora-substrate/api" "1.10.13"
+    "@sora-substrate/liquidity-proxy" "1.10.13"
+    "@sora-substrate/math" "1.10.13"
+    "@sora-substrate/types" "1.10.13"
     axios "^0.21.1"
     bignumber.js "^9.0.1"
     crypto-js "^4.0.0"
@@ -2445,13 +2445,13 @@
     vuex "^3.1.3"
     vuex-class "^0.3.2"
 
-"@soramitsu/soraneo-wallet-web@1.10.31":
-  version "1.10.31"
-  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.10.31.tgz#6494d5badc3fd62894f910a75fff8723e6cfb2ed"
-  integrity sha512-UJ5vhbTN3kf4IDhuhnqUHAVflK1mAMehOFFKygUUGSvg0QWbpEfQ88mAsHFGdmA4/c/TTg7wnCCr+CqMCUMdqw==
+"@soramitsu/soraneo-wallet-web@1.10.32":
+  version "1.10.32"
+  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.10.32.tgz#87deeef7a94e7f7f83a0a8d5aef927c625c315ab"
+  integrity sha512-8Psj1hhhHOXXfdlY7/KwbmEyAajT4MbZ/eMPxLRyrjq3HbuIGLmN5/qFwWKe0hDm6NKLDfKLg2v9ro1qGQo5ew==
   dependencies:
     "@polkadot/vue-identicon" "2.6.1"
-    "@sora-substrate/util" "1.10.10"
+    "@sora-substrate/util" "1.10.13"
     "@soramitsu/soramitsu-js-ui" "^1.0.39"
     "@subwallet/wallet-connect" "^0.2.3"
     "@urql/core" "^2.5.0"