Merge pull request #756 from LedgerHQ/cev/w3c_optin_screens

W3C Wording and Screens

Author: cedelavergne-ledger

src_features/provide_tx_simulation/cmd_get_tx_simulation.c

@@ -502,7 +502,7 @@ static bool handle_tlv_payload(const uint8_t *payload, uint16_t size, bool to_fr
     }
     if (strlen(ctx.simu->partner) == 0) {
         // Set a default value for partner
-        snprintf((char *) ctx.simu->partner, sizeof(ctx.simu->partner), "Web3 Checks");
+        snprintf((char *) ctx.simu->partner, sizeof(ctx.simu->partner), "Transaction Checks");
     }
     print_simulation_info(&ctx);
     return true;

src_nbgl/ui_home.c

@@ -168,9 +168,9 @@ static void prepare_and_display_home(const char *appname, const char *tagline, u
 
 #ifdef HAVE_WEB3_CHECKS
     switches[WEB3_CHECK_ID].initState = N_storage.w3c_enable ? ON_STATE : OFF_STATE;
-    switches[WEB3_CHECK_ID].text = "Transaction checks";
+    switches[WEB3_CHECK_ID].text = "Transaction Check";
     switches[WEB3_CHECK_ID].subText =
-        "Scans transactions for security threats. Learn more: ledger.com/w3c";
+        "Get real-time warnings about risky transactions. Learn more: ledger.com/tx-check";
     switches[WEB3_CHECK_ID].token = WEB3_CHECK_TOKEN;
     switches[WEB3_CHECK_ID].tuneId = TUNE_TAP_CASUAL;
 #endif  // HAVE_WEB3_CHECKS

src_nbgl/ui_tx_simulation.c

@@ -152,9 +152,14 @@ void ui_tx_simulation_opt_in(bool response_expected) {
                                               .token = WARNING_CHOICE_TOKEN,
                                               .style = ROUNDED_AND_FOOTER_STYLE,
                                               .tuneId = TUNE_TAP_CASUAL};
-    nbgl_layoutHeader_t headerDesc = {.type = HEADER_EMPTY,
+
+    nbgl_layoutHeader_t headerDesc = {.type = HEADER_EXTENDED_BACK,
                                       .separationLine = false,
-                                      .emptySpace.height = MEDIUM_CENTERING_HEADER};
+                                      .extendedBack.actionIcon = &QUESTION_CIRCLE_ICON,
+                                      .extendedBack.backToken = NBGL_INVALID_TOKEN,
+                                      .extendedBack.tuneId = TUNE_TAP_CASUAL,
+                                      .extendedBack.text = NULL,
+                                      .extendedBack.actionToken = WARNING_BUTTON_TOKEN};
 
     g_response_expected = response_expected;
     layoutDescription.withLeftBorder = true;
@@ -164,14 +169,12 @@ void ui_tx_simulation_opt_in(bool response_expected) {
     // add header
     nbgl_layoutAddHeader(layoutCtx, &headerDesc);
 
-    // add Top right info button
-    nbgl_layoutAddTopRightButton(layoutCtx, &QUESTION_ICON, WARNING_BUTTON_TOKEN, TUNE_TAP_CASUAL);
-
     // add main content
     info.title = "Enable\nTransaction Check?";
     info.description =
-        "Get real-time warnings about risky transactions, powered by "
-        "service providers. Learn more: ledger.com/tx-check";
+        "Get real-time warnings about risky Ethereum transactions. "
+        "Powered by service providers.";
+    info.subText = "By enabling, you accept T&Cs: ledger.com/tx-check";
     nbgl_layoutAddContentCenter(layoutCtx, &info);
 
     // add button and footer on bottom