diff --git a/package.json b/package.json
index 56194f1e6..e5e582854 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.82.11",
+  "version": "0.82.12",
   "private": true,
   "author": "Liquality <info@liquality.io>",
   "scripts": {
@@ -29,7 +29,7 @@
     "@liquality/ethereum-utils": "^1.13.12",
     "@liquality/terra-networks": "^1.13.12",
     "@liquality/types": "^1.13.12",
-    "@liquality/wallet-core": "4.4.0",
+    "@liquality/wallet-core": "4.5.0",
     "@terra-money/terra.js": "^3.1.6",
     "@testing-library/vue": "^5.8.2",
     "amplitude-js": "8.18.2",
diff --git a/src/manifest.json b/src/manifest.json
index e0c59a0bd..9dd1adacc 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.82.11",
+  "version": "0.82.12",
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
diff --git a/src/views/Account.vue b/src/views/Account.vue
index a7f9c4f32..81532754c 100644
--- a/src/views/Account.vue
+++ b/src/views/Account.vue
@@ -204,9 +204,13 @@ export default {
       return cryptoassets[this.asset]?.chain
     },
     filteredTransactions() {
-      return this.activityData.filter(
-        (t) => t.fromAccountId === this.accountId || t.toAccountId === this.accountId
-      )
+      return this.activityData.filter((t) => {
+        return (
+          t.accountId === this.accountId ||
+          t.fromAccountId === this.accountId ||
+          t.toAccountId === this.accountId
+        )
+      })
     }
   },
   methods: {
diff --git a/src/views/Send/SendNFT.vue b/src/views/Send/SendNFT.vue
index 7360131e1..3b7a2b0dd 100644
--- a/src/views/Send/SendNFT.vue
+++ b/src/views/Send/SendNFT.vue
@@ -349,6 +349,20 @@ export default {
       updatingFees: true
     }
   },
+  watch: {
+    activeView: {
+      handler: async function (newVal) {
+        if (newVal === 'selectedAsset') {
+          this.updatingFees = true
+          await this.updateFees({ asset: this.assetChain })
+          await this.updateSendFees(this.amount)
+          setTimeout(() => {
+            this.updatingFees = false
+          }, 1500)
+        }
+      }
+    }
+  },
   async created() {
     if (this.$route.query.nftAsset) {
       this.activeView = 'selectedAsset'
diff --git a/src/views/Swap/Swap.vue b/src/views/Swap/Swap.vue
index 6027e05a8..e11786c9c 100644
--- a/src/views/Swap/Swap.vue
+++ b/src/views/Swap/Swap.vue
@@ -1301,7 +1301,7 @@ export default {
       //   !BN(this.sendAmount).eq(this.defaultAmount) &&
       //   BN(this.sendAmount).lt(this.max)
       // if(this.cannotCoverMinimum) this.sendAmount = 1
-      this.resetQuoteTimer(!this.canSwap && shouldChooseNewQuote ? 1000 : QUOTE_TIMER_MS)
+      this.resetQuoteTimer(!this.canSwap && shouldChooseNewQuote ? 10000 : QUOTE_TIMER_MS)
     },
     async _updateQuotes() {
       const result = await this.getQuotes({
diff --git a/yarn.lock b/yarn.lock
index fd435ef49..e9c68e8e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5664,8 +5664,8 @@ __metadata:
   linkType: hard
 
 "@uniswap/sdk-core@npm:^3.0.0-alpha.3, @uniswap/sdk-core@npm:^3.0.1":
-  version: 3.1.0
-  resolution: "@uniswap/sdk-core@npm:3.1.0"
+  version: 3.1.1
+  resolution: "@uniswap/sdk-core@npm:3.1.1"
   dependencies:
     "@ethersproject/address": ^5.0.2
     big.js: ^5.2.2
@@ -5673,7 +5673,7 @@ __metadata:
     jsbi: ^3.1.4
     tiny-invariant: ^1.1.0
     toformat: ^2.0.0
-  checksum: 5b7db0c65aa65e3961b438f5198e9abca29c65b64bf404a3340644a222fc60e8192e79d68526fc8cb8b0e1487449fc3497810a4cd5b6556d0b9952b75a6ed13b
+  checksum: d9535bdd8285eca1865ff9fa2d47f03ee498fb8bffd67da543adeaba678b1fcb161e49453f2aa95de8d78dbf17d06683d6dd2708ec1afb00c47ffc10a4e04dbd
   languageName: node
   linkType: hard