From 57ad3992528b8906ea8c83444466146a3e017e6e Mon Sep 17 00:00:00 2001
From: kvhnuke <10602065+kvhnuke@users.noreply.github.com>
Date: Wed, 11 Oct 2023 11:35:24 -0700
Subject: [PATCH] devop: merge changes from kadena team

---
 .../src/providers/kadena/methods/kda_requestAccounts.ts   | 8 +++++---
 .../src/providers/kadena/methods/kda_signTransaction.ts   | 2 +-
 .../src/providers/kadena/ui/kda-sign-message.vue          | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/extension/src/providers/kadena/methods/kda_requestAccounts.ts b/packages/extension/src/providers/kadena/methods/kda_requestAccounts.ts
index 328116118..909a744b0 100644
--- a/packages/extension/src/providers/kadena/methods/kda_requestAccounts.ts
+++ b/packages/extension/src/providers/kadena/methods/kda_requestAccounts.ts
@@ -73,11 +73,13 @@ const method: MiddlewareFunction = function (
           selectedNetwork: selectedNetworkName
             ? getNetworkInfo(selectedNetworkName)
             : null,
-          selectedAccountAddress: account?.address || "",
+          selectedAccountAddress: this.network.displayAddress(
+            account?.address || ""
+          ),
           accounts: accounts.map((acc) => {
             return {
-              address: acc.address,
-              publicKey: acc.publicKey,
+              address: this.network.displayAddress(acc.address),
+              publicKey: acc.publicKey.replace("0x", ""),
               genesisHash: "",
               name: acc.name,
               type: acc.signerType,
diff --git a/packages/extension/src/providers/kadena/methods/kda_signTransaction.ts b/packages/extension/src/providers/kadena/methods/kda_signTransaction.ts
index c18a545b8..17463ec77 100644
--- a/packages/extension/src/providers/kadena/methods/kda_signTransaction.ts
+++ b/packages/extension/src/providers/kadena/methods/kda_signTransaction.ts
@@ -17,7 +17,7 @@ const method: MiddlewareFunction = function (
 
     const reqPayload = payload.params[0];
 
-    this.KeyRing.getAccount(reqPayload.address)
+    this.KeyRing.getAccount(reqPayload.address.replace("k:", "0x"))
       .then((account) => {
         const windowPromise = new WindowPromise();
 
diff --git a/packages/extension/src/providers/kadena/ui/kda-sign-message.vue b/packages/extension/src/providers/kadena/ui/kda-sign-message.vue
index 38374ae04..7c0ce94fa 100644
--- a/packages/extension/src/providers/kadena/ui/kda-sign-message.vue
+++ b/packages/extension/src/providers/kadena/ui/kda-sign-message.vue
@@ -47,6 +47,8 @@
 </template>
 
 <script setup lang="ts">
+import { blake2AsU8a } from "@polkadot/util-crypto";
+import { bufferToHex } from "@enkryptcom/utils";
 import SignLogo from "@action/icons/common/sign-logo.vue";
 import BaseButton from "@action/components/base-button/index.vue";
 import CommonPopup from "@action/views/common-popup/index.vue";
@@ -78,7 +80,6 @@ const account = ref({ address: "" } as EnkryptAccount);
 
 onBeforeMount(async () => {
   const { Request, options } = await windowPromise;
-  console.log(Request.value.params);
   Options.value = options;
   message.value = Request.value.params![0].data;
   account.value = Request.value.params![1] as EnkryptAccount;
@@ -96,11 +97,11 @@ const approve = async () => {
   TransactionSigner({
     account,
     network: network.value,
-    payload: msg.data,
+    payload: bufferToHex(blake2AsU8a(msg.data)),
   })
     .then((res) => {
       Resolve.value({
-        result: res.result as string,
+        result: res.result?.replace("0x", "") as string,
       });
     })
     .catch((er) => {