do not show gas in simple mode (LedgerHQ#6)

TamtamHero · Jun 16, 2020 · 2755e74 · 2755e74
1 parent d11d3aa
commit 2755e74
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 21 deletions.
diff --git a/app/src/tx_display.c b/app/src/tx_display.c
@@ -308,6 +308,9 @@ __Z_INLINE uint8_t get_subitem_count(root_item_e root_item) {
         case root_item_memo:
             break;
         case root_item_fee:
+            if (!tx_is_expert_mode()) {
+                tmp_num_items -= 1;     // Hide Gas field
+            }
         default:
             break;
     }

diff --git a/tests/testcases/manual.json b/tests/testcases/manual.json
@@ -195,8 +195,7 @@
       "2 | Dest Address : cosmosaccaddr1da6hgur4wse3jx32",
       "3 | Dest Coins : 10 atom",
       "4 | Memo : testmemo",
-      "5 | Fee : 5 photon",
-      "6 | Gas : 10000"
+      "5 | Fee : 5 photon"
     ],
     "expert": false
   },
@@ -306,8 +305,7 @@
       "1 | Source Coins : 10 atom",
       "2 | Dest Address : cosmosaccaddr1da6hgur4wse3jx32",
       "3 | Dest Coins : 10 atom",
-      "4 | Fee : 5 photon",
-      "5 | Gas : 10000"
+      "4 | Fee : 5 photon"
     ],
     "expert": false
   },
@@ -419,8 +417,7 @@
       "1 | Source Coins : 10 atom",
       "2 | Dest Address : cosmosaccaddr1da6hgur4wse3jx32",
       "3 | Dest Coins : 10 atom",
-      "4 | Fee : 5 photon",
-      "5 | Gas : 10000"
+      "4 | Fee : 5 photon"
     ],
     "expert": false
   },
@@ -590,8 +587,7 @@
       "6 | Dest Address : test3",
       "7 | Dest Coins : 50 ripple",
       "8 | Memo : testmemo",
-      "9 | Fee : 5 photon",
-      "10 | Gas : 10000"
+      "9 | Fee : 5 photon"
     ],
     "expert": false
   },
@@ -731,8 +727,7 @@
       "3 | Validator [1/2] : cosmosvaloper1grgelyng2v6v3t8z87wu3sxgt",
       "3 | Validator [2/2] : 9m5s03xfytvz7",
       "4 | Memo : Zondax.ch",
-      "5 | Fee : 0.005000 ATOM",
-      "6 | Gas : 200000"
+      "5 | Fee : 0.005000 ATOM"
     ],
     "expert": false
   },
@@ -818,8 +813,7 @@
       "4 | msgs/proposer [2/2] : vwxyz0",
       "5 | msgs/title : test",
       "6 | Memo : abc",
-      "7 | Fee : Empty",
-      "8 | Gas : 500000"
+      "7 | Fee : Empty"
     ],
     "expert": false
   },
@@ -911,8 +905,7 @@
       "3 | Validator [1/2] : cosmosvaloper1grgelyng2v6v3t8z87wu3sxgt",
       "3 | Validator [2/2] : 9m5s03xfytvz7",
       "4 | Memo : Delegated with Ledger from union.market",
-      "5 | Fee : 0.005000 ATOM",
-      "6 | Gas : 200000"
+      "5 | Fee : 0.005000 ATOM"
     ],
     "expert": false
   },
@@ -1111,8 +1104,7 @@
       "2 | Validator [2/2] : vjhennyh568ys",
       "3 | Validator [1/2] : cosmosvaloper1x88j7vp2xnw3zec8ur3g4waxy",
       "3 | Validator [2/2] : cyz7m0mahdv3p",
-      "4 | Fee : 0.000600 ATOM",
-      "5 | Gas : 200000"
+      "4 | Fee : 0.000600 ATOM"
     ],
     "expert": false
   },
@@ -1522,8 +1514,7 @@
       "4 | Amount : 20.139397 ATOM",
       "5 | Validator [1/2] : cosmosvaloper1648ynlpdw7fqa2axt0w2yp3fk",
       "5 | Validator [2/2] : 542junl7rsvq6",
-      "6 | Fee : 0.000600 ATOM",
-      "7 | Gas : 200000"
+      "6 | Fee : 0.000600 ATOM"
     ],
     "expert": false
   }

diff --git a/tests_zemu/snapshots/show-address-and-sign-basic/11.png b/tests_zemu/snapshots/show-address-and-sign-basic/11.png
diff --git a/tests_zemu/snapshots/sign-basic-combined/8.png b/tests_zemu/snapshots/sign-basic-combined/8.png
diff --git a/tests_zemu/snapshots/sign-basic-combined/9.png b/tests_zemu/snapshots/sign-basic-combined/9.png
diff --git a/tests_zemu/snapshots/sign-basic/6.png b/tests_zemu/snapshots/sign-basic/6.png
diff --git a/tests_zemu/tests/test.js b/tests_zemu/tests/test.js
@@ -349,7 +349,7 @@ describe('Basic checks', function () {
 
             // Reference window
             await sim.snapshot(`${snapshotPrefixTmp}${snapshotCount++}.png`);
-            for (let i = 0; i < 7; i++) {
+            for (let i = 0; i < 6; i++) {
                 await sim.clickRight(Resolve(`${snapshotPrefixTmp}${snapshotCount++}.png`));
             }
             await sim.clickBoth();
@@ -405,7 +405,7 @@ describe('Basic checks', function () {
 
             // Reference window
             await sim.snapshot(`${snapshotPrefixTmp}${snapshotCount++}.png`);
-            for (let i = 0; i < 9; i++) {
+            for (let i = 0; i < 8; i++) {
                 await sim.clickRight(Resolve(`${snapshotPrefixTmp}${snapshotCount++}.png`));
             }
             await sim.clickBoth();
@@ -475,7 +475,7 @@ describe('Basic checks', function () {
 
             // Reference window
             await sim.snapshot(`${snapshotPrefixTmp}${snapshotCount++}.png`);
-            for (let i = 0; i < 7; i++) {
+            for (let i = 0; i < 6; i++) {
                 await sim.clickRight(Resolve(`${snapshotPrefixTmp}${snapshotCount++}.png`));
             }
             await sim.clickBoth();