Merge pull request #71 from KiFoundation/fix/divers

Fix/divers
KiFoundation · Mar 14, 2023 · 9d708e9 · 9d708e9
2 parents 5fe14c1 + 789e24e
commit 9d708e9
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ki-desktop-wallet",
   "description": "The KiChain wallet",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": true,
   "main": "build/main/main.js",
   "email": "contact@foundation.ki",

diff --git a/src/main/static/splashscreen.html b/src/main/static/splashscreen.html
@@ -38,7 +38,7 @@
     </main>
 
     <footer>
-      <span> 0.5.0 </span>
+      <span> 0.5.1 </span>
     </footer>
   </body>
 </html>
diff --git a/src/renderer/components/transfer/modals/index.vue b/src/renderer/components/transfer/modals/index.vue
@@ -302,7 +302,7 @@ export default {
             'a',
             {
               attrs: {
-                href: this.explorer + 'transactions/' + res.data.tx_response.txhash,
+                href: this.explorer + 'ki-chain/txs/' + res.data.tx_response.txhash,
                 target: '_blank',
               },
             },

diff --git a/src/renderer/store/wallets/actions.ts b/src/renderer/store/wallets/actions.ts
@@ -142,31 +142,36 @@ export const actions = {
             case 'withdraw': {
               let amount = 0;
               const denom = config.kichain.token;
-
-              let withdraw_msg = tx.logs[0].events.filter((e) => {
-                return e.type.includes('withdraw_rewards');
-              });
-
-              if (withdraw_msg.length > 0 && withdraw_msg[0].attributes) {
-                const amountWithDenomMatch = String(withdraw_msg[0].attributes[0].value).match(
-                  new RegExp(/(\d+)(\w+)/)
-                );
-                const [_, withdrawAmount, withdrawDenom] = amountWithDenomMatch;
-                amount += withdrawAmount;
+
+              if (tx.logs.length == 0) {
+                continue;
               }
-
-              transactions.push([
-                tx.txhash,
-                'withdraw',
-                '',
-                tokenUtil.formatShort(amount),
-                fee,
-                tx.timestamp,
-                tx.tx.body.messages[0].validator_address,
-                denom,
-              ]);
-              break;
-            }
+              else{
+                let withdraw_msg = tx.logs[0].events.filter((e) => {
+                  return e.type.includes('withdraw_rewards');
+                });
+
+                if (withdraw_msg.length > 0 && withdraw_msg[0].attributes) {
+                  const amountWithDenomMatch = String(withdraw_msg[0].attributes[0].value).match(
+                    new RegExp(/(\d+)(\w+)/)
+                  );
+                  const [_, withdrawAmount, withdrawDenom] = amountWithDenomMatch;
+                  amount += withdrawAmount;
+                }
+
+                transactions.push([
+                  tx.txhash,
+                  'withdraw',
+                  '',
+                  tokenUtil.formatShort(amount),
+                  fee,
+                  tx.timestamp,
+                  tx.tx.body.messages[0].validator_address,
+                  denom,
+                ]);
+              }
+            break;
+          }
 
             default:
               transactions.push([

diff --git a/src/renderer/views/wallet/delegation/modals/delegate.modal.vue b/src/renderer/views/wallet/delegation/modals/delegate.modal.vue
@@ -272,7 +272,7 @@ export default {
             'a',
             {
               attrs: {
-                href: this.explorer + 'transactions/' + res.data.tx_response.txhash,
+                href: this.explorer + 'ki-chain/txs/' + res.data.tx_response.txhash,
                 target: '_blank',
               },
             },

diff --git a/src/renderer/views/wallet/delegation/modals/redelegate.modal.vue b/src/renderer/views/wallet/delegation/modals/redelegate.modal.vue
@@ -284,7 +284,7 @@ export default {
             'a',
             {
               attrs: {
-                href: this.explorer + 'transactions/' + res.data.tx_response.txhash,
+                href: this.explorer + 'ki-chain/txs/' + res.data.tx_response.txhash,
                 target: '_blank',
               },
             },

diff --git a/src/renderer/views/wallet/delegation/modals/undelegate.modal.vue b/src/renderer/views/wallet/delegation/modals/undelegate.modal.vue
@@ -293,7 +293,7 @@ export default {
             'a',
             {
               attrs: {
-                href: this.explorer + 'transactions/' + res.data.tx_response.txhash,
+                href: this.explorer + 'ki-chain/txs/' + res.data.tx_response.txhash,
                 target: '_blank',
               },
             },

diff --git a/src/renderer/views/wallet/sign/index.vue b/src/renderer/views/wallet/sign/index.vue
@@ -192,7 +192,7 @@ export default {
       this.sign.summary = this.parseMessage(this.sign.file_content);
     },
     getDenomFormatted(denom: string) {
-      if (denom === this.globalData.kichain.denom) {
+      if (denom === this.globalData.kichain.udenom) {
         return this.globalData.kichain.denom;
       }
       return 'usdc';

diff --git a/src/renderer/views/wallet/withdraw/modals/withdraw-all.modal.vue b/src/renderer/views/wallet/withdraw/modals/withdraw-all.modal.vue
@@ -202,7 +202,7 @@ export default {
             'a',
             {
               attrs: {
-                href: this.explorer + 'transactions/' + res.data.tx_response.txhash,
+                href: this.explorer + 'ki-chain/txs/' + res.data.tx_response.txhash,
                 target: '_blank',
               },
             },

diff --git a/src/renderer/views/wallet/withdraw/modals/withdraw.modal.vue b/src/renderer/views/wallet/withdraw/modals/withdraw.modal.vue
@@ -236,7 +236,7 @@ export default {
             'a',
             {
               attrs: {
-                href: this.explorer + 'transactions/' + res.data.tx_response.txhash,
+                href: this.explorer + 'ki-chain/txs/' + res.data.tx_response.txhash,
                 target: '_blank',
               },
             },