From 2a1b0bc651a2e0b3b81d08abbc21a22e15ae6fbf Mon Sep 17 00:00:00 2001
From: narekpetrosyan <narek.petrosyan988@gmail.com>
Date: Mon, 23 Dec 2024 14:18:48 +0400
Subject: [PATCH] fix: remove spark stuff from Firo testnet

---
 .../extension/src/libs/spark-handler/index.ts   |  4 ++--
 .../bitcoin/ui/send-transaction/index.vue       |  6 +-----
 .../tabs/transparent-send-tab.vue               | 11 +++++++++++
 packages/extension/src/ui/action/App.vue        | 10 ++--------
 .../index.vue                                   | 17 ++++++++++++++++-
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/packages/extension/src/libs/spark-handler/index.ts b/packages/extension/src/libs/spark-handler/index.ts
index aba753e4..686b20a4 100644
--- a/packages/extension/src/libs/spark-handler/index.ts
+++ b/packages/extension/src/libs/spark-handler/index.ts
@@ -31,8 +31,8 @@ export async function sendFromSparkAddress(
   to: string,
   amount: string,
   subtractFee = false
-) {
-  return await callRPC<string[]>("spendspark", [
+): Promise<string> {
+  return await callRPC<string>("spendspark", [
     {
       [to]: {
         amount: Number(amount),
diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
index 873d5f0b..e754681b 100644
--- a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
@@ -9,11 +9,7 @@
       />
 
       <div
-        v-if="
-          !!accountInfo.sparkAccount &&
-          (network.name === NetworkNames.Firo ||
-            network.name === NetworkNames.FiroTest)
-        "
+        v-if="!!accountInfo.sparkAccount && network.name === NetworkNames.Firo"
         class="send-transaction__tabs"
       >
         <button
diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/tabs/transparent-send-tab.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/tabs/transparent-send-tab.vue
index fc3fa83a..a32c20f4 100644
--- a/packages/extension/src/providers/bitcoin/ui/send-transaction/tabs/transparent-send-tab.vue
+++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/tabs/transparent-send-tab.vue
@@ -24,6 +24,17 @@
 
     <div class="form__container-send-input">
       <send-spark-address-input
+        v-if="network.name === 'Firo'"
+        ref="addressInputTo"
+        class="no-margin"
+        title="To address"
+        :value="addressTo"
+        :network="(network as BitcoinNetwork)"
+        @update:input-address="inputAddressTo"
+        @toggle:show-contacts="toggleSelectContactTo"
+      />
+      <send-address-input
+        v-if="network.name !== 'Firo'"
         ref="addressInputTo"
         class="no-margin"
         title="To address"
diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue
index 4a59cdb8..08d31fc5 100644
--- a/packages/extension/src/ui/action/App.vue
+++ b/packages/extension/src/ui/action/App.vue
@@ -295,10 +295,7 @@ const generateNewSparkAddress = async () => {
   }
 };
 const getSparkAccountState = async (network: BaseNetwork) => {
-  if (
-    network.name === NetworkNames.Firo ||
-    network.name === NetworkNames.FiroTest
-  ) {
+  if (network.name === NetworkNames.Firo) {
     const sparkAccountResponse = await getSparkState();
     accountHeaderData.value.sparkAccount = { ...sparkAccountResponse };
   }
@@ -325,10 +322,7 @@ const setNetwork = async (network: BaseNetwork) => {
 
   let sparkAccount: SparkAccount | null = null;
 
-  if (
-    network.name === NetworkNames.Firo ||
-    network.name === NetworkNames.FiroTest
-  ) {
+  if (network.name === NetworkNames.Firo) {
     const sparkAccountResponse = await getSparkState();
     sparkAccount = { ...sparkAccountResponse };
   }
diff --git a/packages/extension/src/ui/action/views/verify-send-from-spark-transaction/index.vue b/packages/extension/src/ui/action/views/verify-send-from-spark-transaction/index.vue
index afc34c07..89e41b96 100644
--- a/packages/extension/src/ui/action/views/verify-send-from-spark-transaction/index.vue
+++ b/packages/extension/src/ui/action/views/verify-send-from-spark-transaction/index.vue
@@ -147,15 +147,30 @@ const sendAction = async () => {
     value: txData.toToken.amount,
     transactionHash: "",
   };
+
   const activityState = new ActivityState();
+
   await sendFromSparkAddress(
     txData.toAddress,
     fromBase(txData.toToken.amount, txData.toToken.decimals).toString()
   )
-    .then(() => {
+    .then((res) => {
       trackSendEvents(SendEventType.SendComplete, {
         network: network.value.name,
       });
+      activityState.addActivities(
+        [
+          {
+            ...txActivity,
+            ...{ transactionHash: res },
+          },
+        ],
+        {
+          address: network.value.displayAddress(txData.fromAddress),
+          network: network.value.name,
+        }
+      );
+
       isSendDone.value = true;
       if (getCurrentContext() === "popup") {
         setTimeout(() => {