Merge pull request #800 from LedgerHQ/no-swipe-to-review-if-tip-box

No "swipe to review" in first page of review if using a Tip-Box
LedgerHQ · Oct 15, 2024 · 8b620e1 · 8b620e1
2 parents bcee06f + 45cb436
commit 8b620e1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib_nbgl/src/nbgl_use_case.c b/lib_nbgl/src/nbgl_use_case.c
@@ -1778,14 +1778,19 @@ static void useCaseReview(nbgl_operationType_t              operationType,
     prepareReviewFirstPage(
         &STARTING_CONTENT.content.extendedCenter.contentCenter, icon, reviewTitle, reviewSubTitle);
     if (tipBox != NULL) {
+        // do not display "Swipe to review" if a tip-box is displayed
+        STARTING_CONTENT.content.extendedCenter.contentCenter.subText = NULL;
+
         STARTING_CONTENT.content.extendedCenter.tipBox.icon   = tipBox->icon;
         STARTING_CONTENT.content.extendedCenter.tipBox.text   = tipBox->text;
         STARTING_CONTENT.content.extendedCenter.tipBox.token  = TIP_BOX_TOKEN;
         STARTING_CONTENT.content.extendedCenter.tipBox.tuneId = TUNE_TAP_CASUAL;
         tipBoxModalTitle                                      = tipBox->modalTitle;
         // the only supported type yet is @ref INFOS_LIST
         if (tipBox->type == INFOS_LIST) {
-            memcpy(&tipBoxInfoList, &tipBox->infos, sizeof(nbgl_contentInfoList_t));
+            tipBoxInfoList.nbInfos      = tipBox->infos.nbInfos;
+            tipBoxInfoList.infoTypes    = PIC(tipBox->infos.infoTypes);
+            tipBoxInfoList.infoContents = PIC(tipBox->infos.infoContents);
         }
     }