diff --git a/app/Makefile.version b/app/Makefile.version
index 7ea8201..05311d3 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=0
 # This is the minor version
 APPVERSION_N=0
 # This is the patch version
-APPVERSION_P=12
+APPVERSION_P=13
diff --git a/app/src/parser_impl_eth.c b/app/src/parser_impl_eth.c
index 4498e79..e6f8cdc 100644
--- a/app/src/parser_impl_eth.c
+++ b/app/src/parser_impl_eth.c
@@ -251,8 +251,14 @@ static parser_error_t printERC20(const parser_context_t *ctx, uint8_t displayIdx
 
         case 7:
             snprintf(outKey, outKeyLen, "Data");
-            array_to_hexstr(data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr, DATA_BYTES_TO_PRINT);
-            snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            array_to_hexstr(
+                data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr,
+                eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT ? DATA_BYTES_TO_PRINT : eth_tx_obj.legacy.data.rlpLen);
+
+            if (eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT) {
+                snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            }
+
             pageString(outVal, outValLen, data_array, pageIdx, pageCount);
             break;
 
@@ -295,8 +301,14 @@ static parser_error_t printGeneric(const parser_context_t *ctx, uint8_t displayI
 
         case 2:
             snprintf(outKey, outKeyLen, "Data");
-            array_to_hexstr(data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr, DATA_BYTES_TO_PRINT);
-            snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            array_to_hexstr(
+                data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr,
+                eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT ? DATA_BYTES_TO_PRINT : eth_tx_obj.legacy.data.rlpLen);
+
+            if (eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT) {
+                snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            }
+
             pageString(outVal, outValLen, data_array, pageIdx, pageCount);
             break;
 
diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
index f19112b..4dc9c52 160000
--- a/deps/ledger-zxlib
+++ b/deps/ledger-zxlib
@@ -1 +1 @@
-Subproject commit f19112bb6340721c276af459924b3c4261c0291a
+Subproject commit 4dc9c5271c2a5060546a78db0bfa01233bf56021
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
index 62dd047..68c5bfa 160000
--- a/deps/nanos-secure-sdk
+++ b/deps/nanos-secure-sdk
@@ -1 +1 @@
-Subproject commit 62dd047774b5e8a6b4e6158b493ee029453b5bae
+Subproject commit 68c5bfa09a048544bdd98178cab397243f17f321
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
index e98fad9..b4e97e4 160000
--- a/deps/nanosplus-secure-sdk
+++ b/deps/nanosplus-secure-sdk
@@ -1 +1 @@
-Subproject commit e98fad9fe6b1b726a7563274659f94ba258e547c
+Subproject commit b4e97e40f78b59293f8f995aed02de4222ad8f4e
diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk
index e98fad9..b4e97e4 160000
--- a/deps/nanox-secure-sdk
+++ b/deps/nanox-secure-sdk
@@ -1 +1 @@
-Subproject commit e98fad9fe6b1b726a7563274659f94ba258e547c
+Subproject commit b4e97e40f78b59293f8f995aed02de4222ad8f4e
diff --git a/deps/stax-secure-sdk b/deps/stax-secure-sdk
index dfe2cfc..b4e97e4 160000
--- a/deps/stax-secure-sdk
+++ b/deps/stax-secure-sdk
@@ -1 +1 @@
-Subproject commit dfe2cfc62c4efdee5dbb2b21caaa28f64792ae46
+Subproject commit b4e97e40f78b59293f8f995aed02de4222ad8f4e
diff --git a/js/package.json b/js/package.json
index b6e6191..0c8110c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -25,8 +25,8 @@
     "url": "https://github.com/zondax/ledger-flare/issues"
   },
   "dependencies": {
-    "@zondax/ledger-js": "^0.2.1",
-    "@ledgerhq/hw-app-eth": "6.29.7"
+    "@ledgerhq/hw-app-eth": "6.35.7",
+    "@zondax/ledger-js": "^0.2.1"
   },
   "devDependencies": {
     "@types/node": "^18.11.18",
@@ -38,8 +38,8 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-promise": "^6.1.1",
-    "prettier": "^2.8.1",
-    "typescript": "^5.3.3"
+    "prettier": "^3.2.5",
+    "typescript": "^5.4.5"
   },
   "files": [
     "dist/**/*"
diff --git a/tests_zemu/package.json b/tests_zemu/package.json
index b66bb6a..d08be40 100644
--- a/tests_zemu/package.json
+++ b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@zondax/ledger-flare": "../js",
-    "@zondax/zemu": "^0.47.0"
+    "@zondax/zemu": "^0.48.0"
   },
   "devDependencies": {
     "@ethereumjs/common": "^2.4.0",
@@ -45,6 +45,6 @@
     "secp256k1": "^5.0.0",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   }
 }
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00000.png
new file mode 100644
index 0000000..1a82409
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00000.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00001.png
new file mode 100644
index 0000000..9ea69ba
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00001.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00002.png
new file mode 100644
index 0000000..c898cf8
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00002.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00003.png
new file mode 100644
index 0000000..abd5710
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00003.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00004.png
new file mode 100644
index 0000000..3653c78
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00004.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00005.png
new file mode 100644
index 0000000..cdf8aef
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00005.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00006.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00006.png
new file mode 100644
index 0000000..7151269
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00006.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00007.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00007.png
new file mode 100644
index 0000000..3837c2d
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00007.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00008.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00008.png
new file mode 100644
index 0000000..25cb3f2
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00008.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00009.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00009.png
new file mode 100644
index 0000000..006c26a
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00009.png differ
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00010.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00010.png
new file mode 100644
index 0000000..a0d6c57
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00010.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00000.png
new file mode 100644
index 0000000..1a82409
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00000.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00001.png
new file mode 100644
index 0000000..9ea69ba
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00001.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00002.png
new file mode 100644
index 0000000..c898cf8
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00002.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00003.png
new file mode 100644
index 0000000..3776d0f
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00003.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00004.png
new file mode 100644
index 0000000..3653c78
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00004.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00005.png
new file mode 100644
index 0000000..cdf8aef
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00005.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00006.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00006.png
new file mode 100644
index 0000000..7151269
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00006.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00007.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00007.png
new file mode 100644
index 0000000..863cb01
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00007.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00008.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00008.png
new file mode 100644
index 0000000..60b8699
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00008.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00009.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00009.png
new file mode 100644
index 0000000..006c26a
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00009.png differ
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00010.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00010.png
new file mode 100644
index 0000000..a0d6c57
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-undelegate_contract/00010.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index 9b8f1b2..b9b4909 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
index 9b8f1b2..b9b4909 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00000.png
new file mode 100644
index 0000000..fe99275
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00000.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00001.png
new file mode 100644
index 0000000..7048638
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00002.png
new file mode 100644
index 0000000..0ebe35a
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00003.png
new file mode 100644
index 0000000..745323f
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00004.png
new file mode 100644
index 0000000..e25bff1
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00004.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00005.png
new file mode 100644
index 0000000..fd51cc1
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00005.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00006.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00006.png
new file mode 100644
index 0000000..b146df2
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00006.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00007.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00007.png
new file mode 100644
index 0000000..b43cea6
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00007.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00008.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00008.png
new file mode 100644
index 0000000..a2c66ce
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00008.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00009.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00009.png
new file mode 100644
index 0000000..1e4be69
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00009.png differ
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00010.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00010.png
new file mode 100644
index 0000000..1a4c3b9
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00010.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00000.png
new file mode 100644
index 0000000..fe99275
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00000.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00001.png
new file mode 100644
index 0000000..7048638
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00002.png
new file mode 100644
index 0000000..0ebe35a
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00003.png
new file mode 100644
index 0000000..4527329
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00004.png
new file mode 100644
index 0000000..e25bff1
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00004.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00005.png
new file mode 100644
index 0000000..fd51cc1
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00005.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00006.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00006.png
new file mode 100644
index 0000000..b146df2
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00006.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00007.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00007.png
new file mode 100644
index 0000000..c592e6d
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00007.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00008.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00008.png
new file mode 100644
index 0000000..ede5611
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00008.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00009.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00009.png
new file mode 100644
index 0000000..1e4be69
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00009.png differ
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00010.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00010.png
new file mode 100644
index 0000000..1a4c3b9
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-undelegate_contract/00010.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index 5f2a18b..034729d 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
index 5f2a18b..034729d 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00000.png
new file mode 100644
index 0000000..a044689
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00000.png differ
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00001.png
new file mode 100644
index 0000000..b773363
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00001.png differ
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00002.png
new file mode 100644
index 0000000..44aad30
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00002.png differ
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00003.png
new file mode 100644
index 0000000..a7f806a
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00003.png differ
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00004.png
new file mode 100644
index 0000000..db43f63
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00004.png differ
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00005.png
new file mode 100644
index 0000000..dacc7cd
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00005.png differ
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00000.png
new file mode 100644
index 0000000..a044689
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-undelegate_contract/00000.png differ
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00001.png
new file mode 100644
index 0000000..4bf0753
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-undelegate_contract/00001.png differ
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00002.png
new file mode 100644
index 0000000..44aad30
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-undelegate_contract/00002.png differ
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00003.png
new file mode 100644
index 0000000..2cd80d2
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-undelegate_contract/00003.png differ
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00004.png
new file mode 100644
index 0000000..db43f63
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-undelegate_contract/00004.png differ
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00005.png
new file mode 100644
index 0000000..dacc7cd
Binary files /dev/null and b/tests_zemu/snapshots/st-eth-undelegate_contract/00005.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
index d37a0c6..03f9e39 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00001.png and b/tests_zemu/snapshots/st-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00002.png b/tests_zemu/snapshots/st-mainmenu/00002.png
index 9a9eff0..27d1402 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00002.png and b/tests_zemu/snapshots/st-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00003.png b/tests_zemu/snapshots/st-mainmenu/00003.png
index be2ebc4..763a062 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00003.png and b/tests_zemu/snapshots/st-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
index 9a9eff0..27d1402 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00004.png and b/tests_zemu/snapshots/st-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00000.png
new file mode 100644
index 0000000..fe99275
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00000.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00001.png
new file mode 100644
index 0000000..7048638
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00001.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00002.png
new file mode 100644
index 0000000..0ebe35a
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00002.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00003.png
new file mode 100644
index 0000000..745323f
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00003.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00004.png
new file mode 100644
index 0000000..e25bff1
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00004.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00005.png
new file mode 100644
index 0000000..fd51cc1
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00005.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00006.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00006.png
new file mode 100644
index 0000000..b146df2
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00006.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00007.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00007.png
new file mode 100644
index 0000000..b43cea6
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00007.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00008.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00008.png
new file mode 100644
index 0000000..a2c66ce
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00008.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00009.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00009.png
new file mode 100644
index 0000000..1e4be69
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00009.png differ
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00010.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00010.png
new file mode 100644
index 0000000..1a4c3b9
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00010.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00000.png
new file mode 100644
index 0000000..fe99275
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00000.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00001.png
new file mode 100644
index 0000000..7048638
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00001.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00002.png
new file mode 100644
index 0000000..0ebe35a
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00002.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00003.png
new file mode 100644
index 0000000..4527329
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00003.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00004.png
new file mode 100644
index 0000000..e25bff1
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00004.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00005.png
new file mode 100644
index 0000000..fd51cc1
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00005.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00006.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00006.png
new file mode 100644
index 0000000..b146df2
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00006.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00007.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00007.png
new file mode 100644
index 0000000..c592e6d
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00007.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00008.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00008.png
new file mode 100644
index 0000000..ede5611
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00008.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00009.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00009.png
new file mode 100644
index 0000000..1e4be69
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00009.png differ
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00010.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00010.png
new file mode 100644
index 0000000..1a4c3b9
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-undelegate_contract/00010.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 5f2a18b..034729d 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
index 5f2a18b..034729d 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ
diff --git a/tests_zemu/tests/eth_legacy.test.ts b/tests_zemu/tests/eth_legacy.test.ts
index 479d6ec..7d7884d 100644
--- a/tests_zemu/tests/eth_legacy.test.ts
+++ b/tests_zemu/tests/eth_legacy.test.ts
@@ -80,6 +80,24 @@ const SIGN_TEST_DATA = [
     },
     chainId: 14,
   },
+  {
+    name: 'undelegate_contract',
+    op: {
+      to: 'c67dce33d7a8efa5ffeb961899c73fe01bce9273',
+      value: '03e8',
+      data: 'b302f393',
+    },
+    chainId: 14,
+  },
+  {
+    name: 'deposit_dummy_contract',
+    op: {
+      to: 'c67dce33d7a8efa5ffeb961899c73fe01bce9273',
+      value: '03e8',
+      data: 'b302f3930001',
+    },
+    chainId: 14,
+  },
 ]
 
 const rawUnsignedLegacyTransaction = (params: any, chainId: number | undefined) => {