diff --git a/src/common/ui/display_nbgl.c b/src/common/ui/display_nbgl.c index 87dc50ce..97ec6ca5 100644 --- a/src/common/ui/display_nbgl.c +++ b/src/common/ui/display_nbgl.c @@ -25,13 +25,10 @@ static void review_choice(bool confirm) { } static void review_choice_sign(bool confirm) { // Answer, display a status page and go back to main - // validate_transaction(confirm); if (confirm) { buildAndSignTransactionHash(); - // nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_SIGNED, ui_menu_main); } else { sendUserRejection(); - // nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_REJECTED, ui_menu_main); } } @@ -77,62 +74,58 @@ void startConfigureBakerUrlDisplay(bool lastUrlPage) { // TODO: To fix void startConfigureDelegationDisplay(void) { - // // Get context from global state - // signConfigureDelegationContext_t *ctx = &global.signConfigureDelegation; - - // // Create tag-value pairs for the content - // nbgl_layoutTagValue_t pairs[4]; // Maximum possible pairs - // uint8_t pairIndex = 0; - - // // Add sender address - // pairs[pairIndex].item = "Sender"; - // pairs[pairIndex].value = (char *) global_account_sender.sender; - // pairIndex++; - - // // Add capital amount if present - // if (ctx->hasCapital) { - // if (ctx->stopDelegation) { - // pairs[pairIndex].item = "Action"; - // pairs[pairIndex].value = "Stop delegation"; - // } else { - // pairs[pairIndex].item = "Amount to delegate"; - // pairs[pairIndex].value = (char *) ctx->displayCapital; - // } - // pairIndex++; - // } - - // // Add restake earnings if present - // if (ctx->hasRestakeEarnings) { - // pairs[pairIndex].item = "Restake earnings"; - // pairs[pairIndex].value = (char *) ctx->displayRestake; - // pairIndex++; - // } - - // // Add delegation target if present - // if (ctx->hasDelegationTarget) { - // pairs[pairIndex].item = "Delegation target"; - // pairs[pairIndex].value = (char *) ctx->displayDelegationTarget; - // pairIndex++; - // } - - // // Create the page content - // nbgl_pageContent_t content; - // content.type = TAG_VALUE_LIST; - // content.title = "Review Transaction"; - // content.isTouchableTitle = true; - // content.topRightIcon = NULL; - // content.tagValueList.nbPairs = pairIndex; - // content.tagValueList.pairs = pairs; - // content.tagValueList.smallCaseForValue = false; - // content.tagValueList.nbMaxLinesForValue = 0; - - // // Setup the review screen - // nbgl_useCaseReviewStart(&C_app_concordium_64px, - // "Review Transaction", - // NULL, // No subtitle - // "Reject transaction", - // buildAndSignTransactionHash, - // sendUserRejection); + // Get context from global state + signConfigureDelegationContext_t *ctx = &global.signConfigureDelegation; + + // Create tag-value pairs for the content + uint8_t pairIndex = 0; + // Add sender address + pairs[pairIndex].item = "Sender"; + pairs[pairIndex].value = (char *) global_account_sender.sender; + pairIndex++; + + // Add capital amount if present + if (ctx->hasCapital) { + if (ctx->stopDelegation) { + pairs[pairIndex].item = "Action"; + pairs[pairIndex].value = "Stop delegation"; + } else { + pairs[pairIndex].item = "Amount to delegate"; + pairs[pairIndex].value = (char *) ctx->displayCapital; + } + pairIndex++; + } + + // Add restake earnings if present + if (ctx->hasRestakeEarnings) { + pairs[pairIndex].item = "Restake earnings"; + pairs[pairIndex].value = (char *) ctx->displayRestake; + pairIndex++; + } + + // Add delegation target if present + if (ctx->hasDelegationTarget) { + pairs[pairIndex].item = "Delegation target"; + pairs[pairIndex].value = (char *) ctx->displayDelegationTarget; + pairIndex++; + } + + // Create the page content + nbgl_contentTagValueList_t content; + content.nbPairs = pairIndex; + content.pairs = pairs; + content.smallCaseForValue = false; + content.nbMaxLinesForValue = 0; + content.startIndex = 0; + + // Setup the review screen + nbgl_useCaseReview(TYPE_TRANSACTION, + &content, + &C_app_concordium_64px, + "Review Transaction", + NULL, // No subtitle + "Sign transaction", + review_choice_sign); } void uiSignUpdateCredentialThresholdDisplay(volatile unsigned int *flags) { diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_capital/00000.png new file mode 100644 index 00000000..d0cd8f66 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_capital/00001.png new file mode 100644 index 00000000..55d54fac Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_capital/00002.png new file mode 100644 index 00000000..b89973eb Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_capital/00003.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital/00003.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00000.png new file mode 100644 index 00000000..d82b8fb4 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00001.png new file mode 100644 index 00000000..4f40533b Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00002.png new file mode 100644 index 00000000..3462249e Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00003.png new file mode 100644 index 00000000..ed602a39 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00003.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00004.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00004.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_restake_target/00004.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00000.png new file mode 100644 index 00000000..d0cd8f66 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00001.png new file mode 100644 index 00000000..5e98d0d9 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00002.png new file mode 100644 index 00000000..b89973eb Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00003.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_capital_target/00003.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00000.png new file mode 100644 index 00000000..d0cd8f66 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00001.png new file mode 100644 index 00000000..7edf2151 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00002.png new file mode 100644 index 00000000..b89973eb Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00003.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_passive_delegation/00003.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_restake/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_restake/00000.png new file mode 100644 index 00000000..d0cd8f66 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_restake/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_restake/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_restake/00001.png new file mode 100644 index 00000000..c81cea52 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_restake/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_restake/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_restake/00002.png new file mode 100644 index 00000000..b89973eb Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_restake/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_restake/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_restake/00003.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_restake/00003.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00000.png new file mode 100644 index 00000000..d0cd8f66 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00001.png new file mode 100644 index 00000000..ab713a78 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00002.png new file mode 100644 index 00000000..b89973eb Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00003.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_stop_delegation/00003.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_target/00000.png b/tests/snapshots/flex/test_sign_configure_delegation_target/00000.png new file mode 100644 index 00000000..d0cd8f66 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_target/00000.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_target/00001.png b/tests/snapshots/flex/test_sign_configure_delegation_target/00001.png new file mode 100644 index 00000000..28895df0 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_target/00001.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_target/00002.png b/tests/snapshots/flex/test_sign_configure_delegation_target/00002.png new file mode 100644 index 00000000..b89973eb Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_target/00002.png differ diff --git a/tests/snapshots/flex/test_sign_configure_delegation_target/00003.png b/tests/snapshots/flex/test_sign_configure_delegation_target/00003.png new file mode 100644 index 00000000..ea645d60 Binary files /dev/null and b/tests/snapshots/flex/test_sign_configure_delegation_target/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_capital/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_capital/00001.png new file mode 100644 index 00000000..a2ec078e Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_capital/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_capital/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00001.png new file mode 100644 index 00000000..91274643 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_restake_target/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00001.png new file mode 100644 index 00000000..4a6f62ad Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_capital_target/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00001.png new file mode 100644 index 00000000..8d17dee1 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_passive_delegation/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_restake/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_restake/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_restake/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_restake/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_restake/00001.png new file mode 100644 index 00000000..c9750b91 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_restake/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_restake/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_restake/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_restake/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_restake/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_restake/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_restake/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00001.png new file mode 100644 index 00000000..6aa551c6 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_stop_delegation/00003.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_target/00000.png b/tests/snapshots/stax/test_sign_configure_delegation_target/00000.png new file mode 100644 index 00000000..e8132c48 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_target/00000.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_target/00001.png b/tests/snapshots/stax/test_sign_configure_delegation_target/00001.png new file mode 100644 index 00000000..ed953b0a Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_target/00001.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_target/00002.png b/tests/snapshots/stax/test_sign_configure_delegation_target/00002.png new file mode 100644 index 00000000..49efffbc Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_target/00002.png differ diff --git a/tests/snapshots/stax/test_sign_configure_delegation_target/00003.png b/tests/snapshots/stax/test_sign_configure_delegation_target/00003.png new file mode 100644 index 00000000..f0407603 Binary files /dev/null and b/tests/snapshots/stax/test_sign_configure_delegation_target/00003.png differ