diff --git a/Makefile b/Makefile
index d837f121..838c5645 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,11 @@ ENABLE_SWAP = 1
 # default enabled in the SDK `Makefile.standard_app`.
 DISABLE_STANDARD_APP_FILES = 1
 
+########################################
+#     Hedera custom Feature flags     #
+########################################
+DISABLE_LEDGER_STAKING_NODE = 1
+
 ########################################
 #          App specific configuration  #
 ########################################
@@ -97,6 +102,9 @@ DEFINES   += PRINTF_FTOA_BUFFER_SIZE=0
 DEFINES   += HAVE_U2F HAVE_IO_U2F
 DEFINES   += U2F_PROXY_MAGIC=\"BOIL\"
 
+# Ledger Staking Node
+DEFINES   += DISABLE_LEDGER_STAKING_NODE=$(DISABLE_LEDGER_STAKING_NODE)
+
 # Allow usage of function from lib_standard_app/crypto_helpers.c
 APP_SOURCE_FILES += ${BOLOS_SDK}/lib_standard_app/crypto_helpers.c
 
diff --git a/src/hedera_format.c b/src/hedera_format.c
index cc2e1ad3..38c0d672 100644
--- a/src/hedera_format.c
+++ b/src/hedera_format.c
@@ -72,11 +72,31 @@ static char *hedera_format_amount(uint64_t amount, uint8_t decimals) {
 
     return buf;
 }
+#define hedera_safe_printf(element, ...) \
+    hedera_snprintf(element, sizeof(element) - 1, __VA_ARGS__)
 
 static char *hedera_format_tinybar(uint64_t tinybar) {
     return hedera_format_amount(tinybar, 8);
 }
 
+static void format_account_id(char senders[ACCOUNT_ID_SIZE],
+                              const Hedera_AccountID *account_id) {
+    if (account_id == NULL) {
+        return;
+    }
+
+    const char *formatter = "%llu.%llu.%llu";
+#ifndef DISABLE_LEDGER_STAKING_NODE
+    if (is_ledger_account(account_id)) {
+        formatter = "Ledger by %llu.%llu.%llu";
+    }
+#endif
+
+    hedera_snprintf(senders, ACCOUNT_ID_SIZE - 1, formatter,
+                    account_id->shardNum, account_id->realmNum,
+                    account_id->account.accountNum);
+}
+
 static void validate_decimals(uint32_t decimals) {
     if (decimals >= 20) {
         // We only support decimal values less than 20
@@ -91,12 +111,10 @@ static void validate_memo(const char memo[100]) {
     }
 }
 
-#define hedera_safe_printf(element, ...) \
-    hedera_snprintf(element, sizeof(element) - 1, __VA_ARGS__)
-
 void reformat_key(void) {
 #if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_NANOS)
-    hedera_safe_printf(st_ctx.summary_line_2, "with Key #%u?", st_ctx.key_index);
+    hedera_safe_printf(st_ctx.summary_line_2, "with Key #%u?",
+                       st_ctx.key_index);
 #elif defined(TARGET_STAX) || defined(TARGET_FLEX)
     hedera_safe_printf(st_ctx.summary_line_2, "#%u", st_ctx.key_index);
 #endif
@@ -115,13 +133,11 @@ void reformat_summary(const char *summary) {
 }
 
 void reformat_summary_send_token(void) {
-    hedera_safe_printf(st_ctx.summary_line_1, "send tokens");   
+    hedera_safe_printf(st_ctx.summary_line_1, "send tokens");
 }
 
 // TITLES
 
-
-
 static void set_senders_title(const char *title) {
     // st_ctx.senders_title --> st_ctx.title (NANOS)
     hedera_safe_printf(st_ctx.senders_title, "%s", title);
@@ -179,27 +195,10 @@ void reformat_stake_target(void) {
     } else if (st_ctx.type == Update) {
         if (st_ctx.transaction.data.cryptoUpdateAccount.which_staked_id ==
             Hedera_CryptoUpdateTransactionBody_staked_account_id_tag) {
-            // Check if this is the special Ledger account
-            if (is_ledger_account(&st_ctx.transaction.data.cryptoUpdateAccount
-                                       .staked_id.staked_account_id)) {
-                hedera_safe_printf(
-                    st_ctx.senders, "Ledger by %llu.%llu.%llu",
-                    st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                        .staked_account_id.shardNum,
-                    st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                        .staked_account_id.realmNum,
-                    st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                        .staked_account_id.account.accountNum);
-            } else {
-                hedera_safe_printf(
-                    st_ctx.senders, "%llu.%llu.%llu",
-                    st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                        .staked_account_id.shardNum,
-                    st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                        .staked_account_id.realmNum,
-                    st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                        .staked_account_id.account.accountNum);
-            }
+            format_account_id(st_ctx.senders,
+                              &st_ctx.transaction.data.cryptoUpdateAccount
+                                   .staked_id.staked_account_id);
+
         } else if (st_ctx.transaction.data.cryptoUpdateAccount
                        .which_staked_id ==
                    Hedera_CryptoUpdateTransactionBody_staked_node_id_tag) {
@@ -289,7 +288,7 @@ void address_to_string(const token_addr_t *addr,
     if (addr == NULL || buf == NULL) {
         return;
     }
-    
+
     hedera_snprintf(buf, MAX_HEDERA_ADDRESS_LENGTH, "%llu.%llu.%llu",
                     addr->addr_shard, addr->addr_realm, addr->addr_account);
 }
@@ -316,27 +315,9 @@ void reformat_stake_in_stake_flow(void) {
     set_recipients_title("Stake to");
     if (st_ctx.transaction.data.cryptoUpdateAccount.which_staked_id ==
         Hedera_CryptoUpdateTransactionBody_staked_account_id_tag) {
-        // Check if this is the special Ledger account
-        if (is_ledger_account(&st_ctx.transaction.data.cryptoUpdateAccount
-                                   .staked_id.staked_account_id)) {
-            hedera_safe_printf(
-                st_ctx.recipients, "Ledger by %llu.%llu.%llu",
-                st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                    .staked_account_id.shardNum,
-                st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                    .staked_account_id.realmNum,
-                st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                    .staked_account_id.account.accountNum);
-        } else {
-            hedera_safe_printf(
-                st_ctx.recipients, "%llu.%llu.%llu",
-                st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                    .staked_account_id.shardNum,
-                st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                    .staked_account_id.realmNum,
-                st_ctx.transaction.data.cryptoUpdateAccount.staked_id
-                    .staked_account_id.account.accountNum);
-        }
+        format_account_id(st_ctx.recipients,
+                          &st_ctx.transaction.data.cryptoUpdateAccount.staked_id
+                               .staked_account_id);
     } else if (st_ctx.transaction.data.cryptoUpdateAccount.which_staked_id ==
                Hedera_CryptoUpdateTransactionBody_staked_node_id_tag) {
         // TODO Node name
@@ -539,8 +520,9 @@ void reformat_auto_renew_period(void) {
         st_ctx.transaction.data.cryptoUpdateAccount.has_autoRenewPeriod) {
         uint64_t seconds =
             st_ctx.transaction.data.cryptoUpdateAccount.autoRenewPeriod.seconds;
-            
-        format_time_duration(st_ctx.auto_renew_period, sizeof(st_ctx.auto_renew_period), seconds);
+
+        format_time_duration(st_ctx.auto_renew_period,
+                             sizeof(st_ctx.auto_renew_period), seconds);
     } else {
         hedera_safe_printf(st_ctx.auto_renew_period, "-");
     }
@@ -564,18 +546,20 @@ void reformat_receiver_sig_required(void) {
         hedera_safe_printf(st_ctx.receiver_sig_required, "-");
         return;
     }
-    
+
     // Check if receiver sig required field is not set
-    if (st_ctx.transaction.data.cryptoUpdateAccount.which_receiverSigRequiredField !=
+    if (st_ctx.transaction.data.cryptoUpdateAccount
+            .which_receiverSigRequiredField !=
         Hedera_CryptoUpdateTransactionBody_receiverSigRequiredWrapper_tag) {
         hedera_safe_printf(st_ctx.receiver_sig_required, "-");
         return;
     }
-    
+
     // Field is set, get the value and format accordingly
-    bool required = st_ctx.transaction.data.cryptoUpdateAccount
-                        .receiverSigRequiredField.receiverSigRequiredWrapper.value;
-    
+    bool required =
+        st_ctx.transaction.data.cryptoUpdateAccount.receiverSigRequiredField
+            .receiverSigRequiredWrapper.value;
+
     hedera_safe_printf(st_ctx.receiver_sig_required, required ? "Yes" : "No");
 }
 
diff --git a/src/staking.c b/src/staking.c
index 2089a005..f2a2dcab 100644
--- a/src/staking.c
+++ b/src/staking.c
@@ -2,6 +2,7 @@
 #include "crypto_update.pb.h"
 #include <stddef.h>
 
+#ifndef DISABLE_LEDGER_STAKING_NODE
 bool is_ledger_account(const Hedera_AccountID *account_id) {
     if (account_id == NULL) {
         return false;
@@ -11,6 +12,7 @@ bool is_ledger_account(const Hedera_AccountID *account_id) {
             account_id->realmNum == LEDGER_ACCOUNT_REALM &&
             account_id->account.accountNum == LEDGER_ACCOUNT_NUM);
 }
+#endif
 
 update_type_t identify_special_update(const Hedera_CryptoUpdateTransactionBody *update_body) {
     if (update_body == NULL) {
diff --git a/src/staking.h b/src/staking.h
index 7d921556..af8ca1a6 100644
--- a/src/staking.h
+++ b/src/staking.h
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include "crypto_update.pb.h"
 
-// Special Ledger account ID
+// Special Ledger account ID (currently disabled by feature flag DISABLE_LEDGER_STAKING_NODE)
 #define LEDGER_ACCOUNT_SHARD 0
 #define LEDGER_ACCOUNT_REALM 0
 #define LEDGER_ACCOUNT_NUM 1337
@@ -23,6 +23,7 @@ typedef enum {
  */
 update_type_t identify_special_update(const struct _Hedera_CryptoUpdateTransactionBody *update_body);
 
+#ifndef DISABLE_LEDGER_STAKING_NODE
 /**
  * Check if an account ID matches the hardcoded Ledger account (0.0.1337)
  * 
@@ -30,3 +31,5 @@ update_type_t identify_special_update(const struct _Hedera_CryptoUpdateTransacti
  * @return true if the account ID matches 0.0.1337, false otherwise
  */
 bool is_ledger_account(const Hedera_AccountID *account_id);
+#endif
+
diff --git a/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_ok/00001.png b/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_ok/00001.png
index 8911e918..8e32bb18 100644
Binary files a/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_ok/00001.png and b/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_ok/00001.png differ
diff --git a/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_refused/00001.png b/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_refused/00001.png
index 8911e918..8e32bb18 100644
Binary files a/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_refused/00001.png and b/tests/standalone/snapshots/flex/test_hedera_crypto_update_account_stake_ledger_refused/00001.png differ
diff --git a/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_ok/00004.png b/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_ok/00004.png
index 6ac6c94c..b9987a27 100644
Binary files a/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_ok/00004.png and b/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_ok/00004.png differ
diff --git a/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_refused/00004.png b/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_refused/00004.png
index 6ac6c94c..b9987a27 100644
Binary files a/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_refused/00004.png and b/tests/standalone/snapshots/nanosp/test_hedera_crypto_update_account_stake_ledger_refused/00004.png differ
diff --git a/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_ok/00004.png b/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_ok/00004.png
index 6ac6c94c..b9987a27 100644
Binary files a/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_ok/00004.png and b/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_ok/00004.png differ
diff --git a/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_refused/00004.png b/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_refused/00004.png
index 6ac6c94c..b9987a27 100644
Binary files a/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_refused/00004.png and b/tests/standalone/snapshots/nanox/test_hedera_crypto_update_account_stake_ledger_refused/00004.png differ
diff --git a/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_ok/00001.png b/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_ok/00001.png
index f1f3fdc1..bdd32685 100644
Binary files a/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_ok/00001.png and b/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_ok/00001.png differ
diff --git a/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_refused/00001.png b/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_refused/00001.png
index f1f3fdc1..bdd32685 100644
Binary files a/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_refused/00001.png and b/tests/standalone/snapshots/stax/test_hedera_crypto_update_account_stake_ledger_refused/00001.png differ
diff --git a/tests/swap/requirements.txt b/tests/swap/requirements.txt
index f9c2f81d..14258a0d 100644
--- a/tests/swap/requirements.txt
+++ b/tests/swap/requirements.txt
@@ -1,6 +1,6 @@
 ragger[tests,speculos] >= 1.36.1
 ledger_app_clients.ethereum
-ledger_app_clients.exchange >= 0.0.4
+ledger_app_clients.exchange >= 0.0.5
 GitPython
 base58
 bip32
diff --git a/tests/swap/snapshots/flex/tests_hedera_sell_valid_1/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_sell_valid_1/review/00001.png
index 2a6fe43b..e88b1b03 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_sell_valid_1/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_sell_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_sell_valid_2/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_sell_valid_2/review/00001.png
index cbe547d1..dda5632f 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_sell_valid_2/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_sell_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00001.png
index 2a6fe43b..e88b1b03 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00004.png b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00004.png
new file mode 100644
index 00000000..db3b5455
Binary files /dev/null and b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_destination/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_destination/review/00001.png
index 2a6fe43b..e88b1b03 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_destination/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_fees/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_fees/review/00001.png
index 2a6fe43b..e88b1b03 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_sell_wrong_fees/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_sell_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_ui_only/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_swap_ui_only/review/00001.png
index 1efc6599..0b815b23 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_swap_ui_only/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_swap_ui_only/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00001.png
index 1efc6599..0b815b23 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00003.png b/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00003.png
new file mode 100644
index 00000000..684f2eae
Binary files /dev/null and b/tests/swap/snapshots/flex/tests_hedera_swap_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_valid_2/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_swap_valid_2/review/00001.png
index e1a7c081..fb4f36b9 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_swap_valid_2/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_swap_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_wrong_amount/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_swap_wrong_amount/review/00001.png
index 1efc6599..0b815b23 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_swap_wrong_amount/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_swap_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_wrong_destination/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_swap_wrong_destination/review/00001.png
index 1efc6599..0b815b23 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_swap_wrong_destination/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_swap_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/flex/tests_hedera_swap_wrong_fees/review/00001.png b/tests/swap/snapshots/flex/tests_hedera_swap_wrong_fees/review/00001.png
index 1efc6599..0b815b23 100644
Binary files a/tests/swap/snapshots/flex/tests_hedera_swap_wrong_fees/review/00001.png and b/tests/swap/snapshots/flex/tests_hedera_swap_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00000.png
index 487ea10f..fdc4fb42 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00000.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00001.png
index fcfe2eb5..ee92f85d 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00001.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00002.png
index b0caa5f1..1a287630 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00002.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00003.png
index ce6b87af..37c49495 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00003.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00004.png
index 0dd51c7b..bf19dd0a 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00004.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00005.png
index 570ce28d..51e706f8 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00005.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00006.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00006.png
index d5a51c54..09a1af10 100644
Binary files a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00006.png and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00006.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00007.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00007.png
new file mode 100644
index 00000000..26c61970
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00007.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00008.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00008.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00008.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00009.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00009.png
new file mode 100644
index 00000000..77bcafde
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00009.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00010.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00010.png
new file mode 100644
index 00000000..f265d694
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/00010.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_1/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00002.png
new file mode 100644
index 00000000..217cc10e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00004.png
new file mode 100644
index 00000000..0c96e63c
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_valid_2/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_amount/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_destination/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_fund_wrong_fees/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00006.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_1/review/00006.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00003.png
new file mode 100644
index 00000000..217cc10e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00005.png
new file mode 100644
index 00000000..0c96e63c
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00006.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_valid_2/review/00006.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00006.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_amount/review/00006.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00006.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_destination/review/00006.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00006.png b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_sell_wrong_fees/review/00006.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_ui_only/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_1/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00002.png
new file mode 100644
index 00000000..217cc10e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00004.png
new file mode 100644
index 00000000..0c96e63c
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_valid_2/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_amount/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_destination/review/00005.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/post_sign/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/post_sign/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00000.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00000.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00001.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00002.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00002.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00003.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00003.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00004.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00004.png differ
diff --git a/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00005.png b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanosp/tests_hedera_swap_wrong_fees/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00000.png
index 487ea10f..fdc4fb42 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00000.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00001.png
index fcfe2eb5..ee92f85d 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00001.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00002.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00002.png
index b0caa5f1..1a287630 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00002.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00003.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00003.png
index ce6b87af..37c49495 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00003.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00004.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00004.png
index 0dd51c7b..bf19dd0a 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00004.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00005.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00005.png
index 570ce28d..51e706f8 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00005.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00006.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00006.png
index d5a51c54..09a1af10 100644
Binary files a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00006.png and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/00006.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_1/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00002.png
new file mode 100644
index 00000000..217cc10e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00004.png
new file mode 100644
index 00000000..0c96e63c
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_valid_2/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_amount/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_destination/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00000.png
new file mode 100644
index 00000000..fdc4fb42
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00001.png
new file mode 100644
index 00000000..ee92f85d
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00003.png
new file mode 100644
index 00000000..37c49495
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00005.png
new file mode 100644
index 00000000..51e706f8
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_fund_wrong_fees/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00006.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_1/review/00006.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00003.png
new file mode 100644
index 00000000..217cc10e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00005.png
new file mode 100644
index 00000000..0c96e63c
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00006.png b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_valid_2/review/00006.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00006.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_amount/review/00006.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00006.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_destination/review/00006.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00000.png
new file mode 100644
index 00000000..779701ea
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00002.png
new file mode 100644
index 00000000..4ee87fd4
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00003.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00004.png
new file mode 100644
index 00000000..6959d711
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00005.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00006.png b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00006.png
new file mode 100644
index 00000000..d28142cc
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_sell_wrong_fees/review/00006.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_ui_only/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_1/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/post_sign/00000.png
new file mode 100644
index 00000000..3a161194
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00002.png
new file mode 100644
index 00000000..217cc10e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00004.png
new file mode 100644
index 00000000..0c96e63c
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_valid_2/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_amount/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_destination/review/00005.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/post_sign/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/post_sign/00000.png
new file mode 100644
index 00000000..d56d4138
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/post_sign/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/post_sign/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/post_sign/00001.png
new file mode 100644
index 00000000..95728b4e
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/post_sign/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00000.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00000.png
new file mode 100644
index 00000000..528ce901
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00000.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00001.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00001.png
new file mode 100644
index 00000000..1a80bb27
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00002.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00002.png
new file mode 100644
index 00000000..1a287630
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00002.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00003.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00003.png
new file mode 100644
index 00000000..de982a76
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00003.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00004.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00004.png
new file mode 100644
index 00000000..bf19dd0a
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00004.png differ
diff --git a/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00005.png b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00005.png
new file mode 100644
index 00000000..c2d3d181
Binary files /dev/null and b/tests/swap/snapshots/nanox/tests_hedera_swap_wrong_fees/review/00005.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_sell_valid_1/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_sell_valid_1/review/00001.png
index 2548a25f..a5e41a95 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_sell_valid_1/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_sell_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_sell_valid_2/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_sell_valid_2/review/00001.png
index 17dbc2a3..d97f0c60 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_sell_valid_2/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_sell_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_sell_wrong_amount/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_sell_wrong_amount/review/00001.png
index 2548a25f..a5e41a95 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_sell_wrong_amount/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_sell_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_sell_wrong_destination/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_sell_wrong_destination/review/00001.png
index 2548a25f..a5e41a95 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_sell_wrong_destination/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_sell_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_sell_wrong_fees/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_sell_wrong_fees/review/00001.png
index 2548a25f..a5e41a95 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_sell_wrong_fees/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_sell_wrong_fees/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_swap_ui_only/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_swap_ui_only/review/00001.png
index 8a6bb042..ab75df2a 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_swap_ui_only/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_swap_ui_only/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_swap_valid_1/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_swap_valid_1/review/00001.png
index 8a6bb042..ab75df2a 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_swap_valid_1/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_swap_valid_1/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_swap_valid_2/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_swap_valid_2/review/00001.png
index 66ee8b0e..dd11a934 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_swap_valid_2/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_swap_valid_2/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_swap_wrong_amount/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_swap_wrong_amount/review/00001.png
index 8a6bb042..ab75df2a 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_swap_wrong_amount/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_swap_wrong_amount/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_swap_wrong_destination/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_swap_wrong_destination/review/00001.png
index 8a6bb042..ab75df2a 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_swap_wrong_destination/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_swap_wrong_destination/review/00001.png differ
diff --git a/tests/swap/snapshots/stax/tests_hedera_swap_wrong_fees/review/00001.png b/tests/swap/snapshots/stax/tests_hedera_swap_wrong_fees/review/00001.png
index 8a6bb042..ab75df2a 100644
Binary files a/tests/swap/snapshots/stax/tests_hedera_swap_wrong_fees/review/00001.png and b/tests/swap/snapshots/stax/tests_hedera_swap_wrong_fees/review/00001.png differ