From 45cb436f4405a55ffbed038630ca6ca01d1f4547 Mon Sep 17 00:00:00 2001 From: Nicolas Roggeman Date: Tue, 15 Oct 2024 16:21:05 +0200 Subject: [PATCH] No "swipe to review" in first page of review if using a Tip-Box --- lib_nbgl/src/nbgl_use_case.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_nbgl/src/nbgl_use_case.c b/lib_nbgl/src/nbgl_use_case.c index e331f8a85..dada714fa 100644 --- a/lib_nbgl/src/nbgl_use_case.c +++ b/lib_nbgl/src/nbgl_use_case.c @@ -1778,6 +1778,9 @@ 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; @@ -1785,7 +1788,9 @@ static void useCaseReview(nbgl_operationType_t operationType, 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); } }