From 71f4cca93a27055df8298621d7697a0714bbbabc Mon Sep 17 00:00:00 2001
From: karczuRF <oskar.karcz@rumblefish.pl>
Date: Thu, 21 Nov 2024 10:48:24 +0100
Subject: [PATCH] fix front bugs

---
 locales/en/components.json                    |  5 +-
 locales/pl/components.json                    |  3 +-
 .../TransactionConfirmationModal.tsx          | 46 ++++++-------------
 src/helpers/transaction.ts                    | 31 +++++++++++++
 src/store/simulation/simulation.action.ts     | 27 +++++++++--
 5 files changed, 72 insertions(+), 40 deletions(-)
 create mode 100644 src/helpers/transaction.ts

diff --git a/locales/en/components.json b/locales/en/components.json
index 15e4839..607901e 100644
--- a/locales/en/components.json
+++ b/locales/en/components.json
@@ -19,6 +19,7 @@
   "open-logs-directory": "Logs",
   "simulation-status": "Simulation status",
   "simulation-error-msg": "Simulation error message",
-  "tx-simulation-status": "Simulated transaction error",
-  "tx-simulation-error-msg": "Simulated tx error message"
+  "tx-simulation-status": "Simulated transaction status",
+  "tx-simulation-error-msg": "Simulated tx error message",
+  "no-balance-update": "No balance updates available."
 }
diff --git a/locales/pl/components.json b/locales/pl/components.json
index b0d816d..0b80289 100644
--- a/locales/pl/components.json
+++ b/locales/pl/components.json
@@ -20,5 +20,6 @@
   "simulation-status": "Status symulacji",
   "simulation-error-msg": "Błąd symulacji",
   "tx-simulation-status": "Status symulowanej transakcji",
-  "tx-simulation-error-msg": "Błąd symulowanej transakcji"
+  "tx-simulation-error-msg": "Błąd symulowanej transakcji",
+  "no-balance-update": "Aktualizacja balansów niedostępna"
 }
diff --git a/src/components/TransactionConfirmationModal.tsx b/src/components/TransactionConfirmationModal.tsx
index 1958ee1..9ae8a9a 100644
--- a/src/components/TransactionConfirmationModal.tsx
+++ b/src/components/TransactionConfirmationModal.tsx
@@ -10,9 +10,9 @@ import { simulationActions } from "../store/simulation/simulation.slice"
 import { BalanceUpdateView } from "./BalanceUpdate"
 import { useTranslation } from "react-i18next"
 import { ErrorSource } from "../store/error/error.types"
-import { CallFunction, CallMethod } from "@tari-project/tarijs/dist/builders/types/Instruction"
 import { resolveBackendErrorMessage } from "./ErrorSnackBar"
 import { metadataSelector } from "../store/metadata/metadata.selector"
+import { getFunctionOrMethod, getTransactionStatusName } from "../helpers/transaction"
 
 const selectSimulationById = (state: RootState, id?: number) => (id ? simulationsSelectors.selectById(state, id) : null)
 
@@ -50,31 +50,6 @@ export const TransactionConfirmationModal: React.FC = () => {
     )
   }
 
-  interface InstructionWithArgs {
-    instructionName: string
-    args: any[]
-  }
-  // Function to get function or method fields
-  function getFunctionOrMethod(instructions: object[]): InstructionWithArgs[] {
-    let functionNames: InstructionWithArgs[] = []
-    instructions.forEach((instruction) => {
-      // Check if the instruction is an object and not a string
-      if (typeof instruction === "object" && instruction !== null) {
-        if ("CallFunction" in instruction) {
-          const callFunction = instruction as CallFunction
-          functionNames.push({
-            instructionName: callFunction.CallFunction.function,
-            args: callFunction.CallFunction.args,
-          })
-        } else if ("CallMethod" in instruction) {
-          const callMethod = instruction as CallMethod
-          functionNames.push({ instructionName: callMethod.CallMethod.method, args: callMethod.CallMethod.args })
-        }
-      }
-    })
-    return functionNames
-  }
-
   return (
     <Dialog open={!!transaction} maxWidth="sm" fullWidth>
       <DialogTitle textAlign="center">{t("transaction-confirmation", { ns: "components" })}:</DialogTitle>
@@ -88,7 +63,7 @@ export const TransactionConfirmationModal: React.FC = () => {
             {getFunctionOrMethod(arg.instructions)
               .flatMap((i) => i.instructionName + " with args: " + i.args)
               .map((instruction, index) => (
-                <div key={index}>{instruction}</div> // Using <div> or <span> to wrap each instruction
+                <div key={index}>{instruction}</div>
               ))}
           </DialogContentText>
         ))}
@@ -102,19 +77,24 @@ export const TransactionConfirmationModal: React.FC = () => {
           </DialogContentText>
         )}
         <DialogContentText>
-          {t("balance-updates", { ns: "components" })}:
+          {t("balance-updates", { ns: "components" })}:{" "}
           {Array.isArray(simulation?.balanceUpdates) && simulation.balanceUpdates.length > 0 ? (
             simulation.balanceUpdates.map((update) => <BalanceUpdateView key={update.vaultAddress} {...update} />)
           ) : (
-            <span> No balance updates available.</span> // Optional: Provide feedback if there are no updates
+            <span>{t("no-balance-update", { ns: "components" })}</span>
           )}
         </DialogContentText>
         <DialogContentText>
-          {t("tx-simulation-status", { ns: "components" })}: {simulation?.transaction?.status ?? "-"}
-        </DialogContentText>
-        <DialogContentText>
-          {t("tx-simulation-error-msg", { ns: "components" })}: {simulation?.transaction?.errorMsg ?? "-"}
+          {t("tx-simulation-status", { ns: "components" })}: {getTransactionStatusName(simulation?.transaction?.status)}
         </DialogContentText>
+        {simulation?.transaction.errorMsg && (
+          <DialogContentText>
+            {t("tx-simulation-error-msg", { ns: "components" })}:{" "}
+            {typeof simulation?.transaction?.errorMsg === "string"
+              ? simulation.transaction.errorMsg
+              : JSON.stringify(simulation?.transaction?.errorMsg)}
+          </DialogContentText>
+        )}
       </DialogContent>
       <DialogActions>
         <Button onClick={handleClose} variant="contained">
diff --git a/src/helpers/transaction.ts b/src/helpers/transaction.ts
new file mode 100644
index 0000000..26674fc
--- /dev/null
+++ b/src/helpers/transaction.ts
@@ -0,0 +1,31 @@
+import { TransactionStatus } from "@tari-project/tarijs"
+import { CallFunction, CallMethod } from "@tari-project/tarijs/dist/builders/types/Instruction"
+
+interface InstructionWithArgs {
+  instructionName: string
+  args: any[]
+}
+
+export function getFunctionOrMethod(instructions: object[]): InstructionWithArgs[] {
+  let functionNames: InstructionWithArgs[] = []
+  instructions.forEach((instruction) => {
+    if (typeof instruction === "object" && instruction !== null) {
+      if ("CallFunction" in instruction) {
+        const callFunction = instruction as CallFunction
+        functionNames.push({
+          instructionName: callFunction.CallFunction.function,
+          args: callFunction.CallFunction.args,
+        })
+      } else if ("CallMethod" in instruction) {
+        const callMethod = instruction as CallMethod
+        functionNames.push({ instructionName: callMethod.CallMethod.method, args: callMethod.CallMethod.args })
+      }
+    }
+  })
+  return functionNames
+}
+
+export function getTransactionStatusName(status?: TransactionStatus): string {
+  if (!status) return ""
+  return TransactionStatus[status]
+}
diff --git a/src/store/simulation/simulation.action.ts b/src/store/simulation/simulation.action.ts
index 92b6a61..615d0fc 100644
--- a/src/store/simulation/simulation.action.ts
+++ b/src/store/simulation/simulation.action.ts
@@ -2,6 +2,7 @@ import { ListenerEffectAPI, PayloadAction, ThunkDispatch, UnknownAction } from "
 import { simulationActions } from "./simulation.slice"
 import { SimulationRequestPayload } from "./simulation.types"
 import { RootState } from "../store"
+import { TransactionStatus } from "@tari-project/tarijs"
 
 export const runTransactionSimulationAction = () => ({
   actionCreator: simulationActions.runSimulationRequest,
@@ -16,16 +17,34 @@ export const runTransactionSimulationAction = () => ({
     const { runSimulation } = state.transaction.entities[transactionId]
 
     if (!provider) {
-      dispatch(simulationActions.runSimulationFailure({ transactionId, errorMsg: "Provider not found" }))
+      dispatch(
+        simulationActions.runSimulationFailure({
+          transactionId,
+          errorMsg: "Provider not found",
+          transaction: { status: TransactionStatus.InvalidTransaction, errorMsg: "Provider not found" },
+        })
+      )
       return
     }
 
     try {
-      const balanceUpdates = await runSimulation()
-      dispatch(simulationActions.runSimulationSuccess({ transactionId, balanceUpdates }))
+      const simulationResult = await runSimulation()
+      dispatch(
+        simulationActions.runSimulationSuccess({
+          transactionId,
+          balanceUpdates: simulationResult.balanceUpdates,
+          transaction: simulationResult.txSimulation,
+        })
+      )
     } catch (error) {
       console.error(error)
-      dispatch(simulationActions.runSimulationFailure({ transactionId, errorMsg: String(error) }))
+      dispatch(
+        simulationActions.runSimulationFailure({
+          transactionId,
+          errorMsg: String(error),
+          transaction: { status: TransactionStatus.Rejected, errorMsg: String(error) },
+        })
+      )
     }
   },
 })