From b857c16b873c730a38a6762a8c6f28b7b6c73c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Varga-Somogyi=20=C3=81kos?= <vsakos@gmail.com>
Date: Wed, 30 Aug 2023 14:09:51 +0200
Subject: [PATCH] Remove simulationResult and displayMessage params

---
 snap.manifest.json |  2 +-
 src/index.js       | 14 ++++----------
 src/ui.js          | 24 ++++++------------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/snap.manifest.json b/snap.manifest.json
index 5cf2344..9545fc8 100644
--- a/snap.manifest.json
+++ b/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/solflare-wallet/aptos-snap.git"
   },
   "source": {
-    "shasum": "dvy77Sic8W9tPKgEL2q/nXlDWninPwmH8tAM8zqlg4k=",
+    "shasum": "w/3xBQyxmW5eRm+uZiYjuaTThHdHL/ldbqnog1p/s24=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/src/index.js b/src/index.js
index a8345ab..87c0913 100644
--- a/src/index.js
+++ b/src/index.js
@@ -36,17 +36,14 @@ module.exports.onRpcRequest = async ({ origin, request }) => {
       return pubkey;
     }
     case 'signTransaction': {
-      const { derivationPath, message, simulationResult = [], displayMessage = true } = request.params || {};
+      const { derivationPath, message } = request.params || {};
 
       assertInput(derivationPath);
       assertIsString(derivationPath);
       assertInput(message);
       assertIsString(message);
-      assertIsArray(simulationResult);
-      assertAllStrings(simulationResult);
-      assertIsBoolean(displayMessage);
 
-      const accepted = await renderSignTransaction(dappHost, message, simulationResult, displayMessage);
+      const accepted = await renderSignTransaction(dappHost, message);
       assertConfirmation(accepted);
 
       const keyPair = await deriveKeyPair(derivationPath);
@@ -59,7 +56,7 @@ module.exports.onRpcRequest = async ({ origin, request }) => {
       };
     }
     case 'signAllTransactions': {
-      const { derivationPath, messages, simulationResults = [], displayMessage = true } = request.params || {};
+      const { derivationPath, messages } = request.params || {};
 
       assertInput(derivationPath);
       assertIsString(derivationPath);
@@ -67,11 +64,8 @@ module.exports.onRpcRequest = async ({ origin, request }) => {
       assertIsArray(messages);
       assertInput(messages.length);
       assertAllStrings(messages);
-      assertIsArray(simulationResults);
-      assertInput(messages.length === simulationResults.length);
-      assertIsBoolean(displayMessage);
 
-      const accepted = await renderSignAllTransactions(dappHost, messages, simulationResults, displayMessage);
+      const accepted = await renderSignAllTransactions(dappHost, messages);
       assertConfirmation(accepted);
 
       const keyPair = await deriveKeyPair(derivationPath);
diff --git a/src/ui.js b/src/ui.js
index 582f5da..3aa5703 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -1,5 +1,4 @@
 import { panel, heading, text, copyable, divider } from '@metamask/snaps-ui';
-import { assertAllStrings, assertInput, assertIsArray } from './utils';
 
 export function renderGetPublicKey(host, pubkey) {
   return snap.request({
@@ -16,9 +15,7 @@ export function renderGetPublicKey(host, pubkey) {
   });
 }
 
-export function renderSignTransaction(host, message, simulationResult, displayMessage = true) {
-  const simulationResultItems = simulationResult.map((item) => text(item));
-
+export function renderSignTransaction(host, message) {
   return snap.request({
     method: 'snap_dialog',
     params: {
@@ -26,17 +23,16 @@ export function renderSignTransaction(host, message, simulationResult, displayMe
       content: panel([
         heading('Sign transaction'),
         text(host),
-        ...(simulationResultItems.length > 0 || displayMessage ? [divider()] : []),
-        ...simulationResultItems,
-        ...(displayMessage ? [copyable(message)] : [])
+        divider(),
+        copyable(message)
       ])
     }
   });
 }
 
-export function renderSignAllTransactions(host, messages, simulationResults, displayMessage = true) {
+export function renderSignAllTransactions(host, messages) {
   if (messages.length === 1) {
-    return renderSignTransaction(host, messages[0], simulationResults[0], displayMessage);
+    return renderSignTransaction(host, messages[0]);
   }
 
   const uiElements = [];
@@ -44,15 +40,7 @@ export function renderSignAllTransactions(host, messages, simulationResults, dis
   for (let i = 0; i < messages.length; i++) {
     uiElements.push(divider());
     uiElements.push(text(`Transaction ${i + 1}`));
-
-    assertIsArray(simulationResults[i]);
-    assertInput(simulationResults[i].length);
-    assertAllStrings(simulationResults[i]);
-
-    simulationResults[i].forEach((item) => uiElements.push(text(item)));
-    if (displayMessage) {
-      uiElements.push(copyable(messages[i]));
-    }
+    uiElements.push(copyable(messages[i]));
   }
 
   return snap.request({