Merge pull request #56 from blooo-io/feat/LDG-607--nano-app-implement…

…-signtransferwithscheduleandme Feat/LDG-607--nano-app-implement-signtransferwithscheduleandme
blooo-io · Dec 13, 2024 · 7297c55 · 7297c55
2 parents dafa419 + 3c1cd07
commit 7297c55
Show file tree

Hide file tree

Showing 83 changed files with 305 additions and 184 deletions.
diff --git a/src/common/ui/display_nbgl.c b/src/common/ui/display_nbgl.c
@@ -3,6 +3,8 @@
 
 accountSender_t global_account_sender;
 static nbgl_contentTagValue_t pairs[10];
+static signTransferWithScheduleContext_t *ctx_sign_transfer_with_schedule =
+    &global.withDataBlob.signTransferWithScheduleContext;
 
 static void review_choice(bool confirm) {
     // Answer, display a status page and go back to main
@@ -40,6 +42,13 @@ static void review_choice_sign(bool confirm) {
     }
 }
 
+static void keep_going_with_transaction(bool confirm) {
+    if (confirm) {
+        sendSuccessNoIdle();
+    } else {
+        sendUserRejection();
+    }
+}
 static void sendSuccessNoIdleCallback(bool confirm) {
     (void)confirm;  // Suppress unused parameter warning
     sendSuccessNoIdle();
@@ -799,19 +808,69 @@ void uiSignTransferToPublicDisplay(volatile unsigned int *flags) {
     *flags |= IO_ASYNCH_REPLY;
 }
 
+// Add this wrapper function before uiSignScheduledTransferPairFlowDisplay
+static void processNextScheduledAmountWrapper(bool choice) {
+    if (choice) {
+        processNextScheduledAmount(ctx_sign_transfer_with_schedule->buffer);
+    } else {
+        sendUserRejection();
+    }
+}
+
 void uiSignScheduledTransferPairFlowDisplay(void) {
-    return;
-    // TODO: Implement this
+    // Setup data to display
+    uint8_t pairIndex = 0;
+    pairs[pairIndex].item = "Release time (UTC)";
+    pairs[pairIndex].value =
+        (char *)global.withDataBlob.signTransferWithScheduleContext.displayTimestamp;
+    pairIndex++;
+    pairs[pairIndex].item = "Amount";
+    pairs[pairIndex].value = (char *)global.withDataBlob.signTransferWithScheduleContext.displayStr;
+    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_useCaseReviewLight(TYPE_TRANSACTION,
+                            &content,
+                            &C_app_concordium_64px,
+                            "Review Scheduled release",
+                            NULL,  // No subtitle
+                            "Show next release",
+                            processNextScheduledAmountWrapper);
 }
 
 void uiSignScheduledTransferPairFlowSignDisplay(void) {
-    return;
-    // TODO: Implement this
-}
+    // Setup data to display
+    uint8_t pairIndex = 0;
+    pairs[pairIndex].item = "Release time (UTC)";
+    pairs[pairIndex].value =
+        (char *)global.withDataBlob.signTransferWithScheduleContext.displayTimestamp;
+    pairIndex++;
+    pairs[pairIndex].item = "Amount";
+    pairs[pairIndex].value = (char *)global.withDataBlob.signTransferWithScheduleContext.displayStr;
+    pairIndex++;
 
-void uiSignScheduledTransferPairFlowFinalDisplay(void) {
-    return;
-    // TODO: Implement this
+    // 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 Scheduled release",
+                       NULL,  // No subtitle
+                       "Sign transaction",
+                       review_choice_sign);
 }
 
 void uiVerifyAddress(volatile unsigned int *flags) {
@@ -821,8 +880,33 @@ void uiVerifyAddress(volatile unsigned int *flags) {
 }
 
 void startInitialScheduledTransferDisplay(bool displayMemo) {
-    displayMemo = false;
-    // TODO: Implement this
+    uint8_t index = 0;
+    pairs[index].item = "Sender";
+    pairs[index].value = (char *)global_account_sender.sender;
+    index++;
+    pairs[index].item = "Recipient";
+    pairs[index].value = (char *)global.withDataBlob.signTransferWithScheduleContext.displayStr;
+    index++;
+    if (displayMemo) {
+        pairs[index].item = "Memo";
+        pairs[index].value = (char *)global.withDataBlob.cborContext.display;
+        index++;
+    }
+    // Create the page content
+    nbgl_contentTagValueList_t content;
+    content.nbPairs = index;
+    content.pairs = pairs;
+    content.smallCaseForValue = false;
+    content.nbMaxLinesForValue = 0;
+    content.startIndex = 0;
+    // Setup the review screen
+    nbgl_useCaseReviewLight(TYPE_TRANSACTION,
+                            &content,
+                            &C_app_concordium_64px,
+                            "Review Transfer with schedule",
+                            NULL,  // No subtitle
+                            "Continue with transfer",
+                            keep_going_with_transaction);
 }
 
 void uiDeployModuleDisplay(void) {

diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00000.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00000.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00001.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00001.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00002.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00002.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00003.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00003.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00004.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00004.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00005.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00005.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00006.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00006.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00007.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00007.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00008.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00008.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00009.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00009.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00010.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00010.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00011.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00011.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00012.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00012.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00013.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00013.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00014.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00014.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00015.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00015.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00016.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00016.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00017.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00017.png
diff --git a/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00018.png b/...apshots/flex/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00018.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00000.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00000.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00001.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00001.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00002.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00002.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00003.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00003.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00004.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00004.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00005.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00005.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00006.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00006.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00007.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00007.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00008.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00008.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00009.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00009.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00010.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00010.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00011.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00011.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00012.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00012.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00013.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00013.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00014.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00014.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00015.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00015.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00016.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00016.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00017.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00017.png
diff --git a/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00018.png b/tests/snapshots/flex/test_sign_tx_transfer_with_schedule_legacy_path/00018.png
diff --git a/...shots/nanosp/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00022.png b/...shots/nanosp/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00022.png
diff --git a/tests/snapshots/nanosp/test_sign_tx_transfer_with_schedule_legacy_path/00021.png b/tests/snapshots/nanosp/test_sign_tx_transfer_with_schedule_legacy_path/00021.png
diff --git a/...pshots/nanox/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00022.png b/...pshots/nanox/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00022.png
diff --git a/tests/snapshots/nanox/test_sign_tx_transfer_with_schedule_legacy_path/00021.png b/tests/snapshots/nanox/test_sign_tx_transfer_with_schedule_legacy_path/00021.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00000.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00000.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00001.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00001.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00002.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00002.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00003.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00003.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00004.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00004.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00005.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00005.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00006.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00006.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00007.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00007.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00008.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00008.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00009.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00009.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00010.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00010.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00011.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00011.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00012.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00012.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00013.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00013.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00014.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00014.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00015.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00015.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00016.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00016.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00017.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00017.png
diff --git a/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00018.png b/...apshots/stax/test_sign_tx_transfer_with_schedule_and_memo_legacy_path/00018.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00000.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00000.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00001.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00001.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00002.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00002.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00003.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00003.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00004.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00004.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00005.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00005.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00006.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00006.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00007.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00007.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00008.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00008.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00009.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00009.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00010.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00010.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00011.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00011.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00012.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00012.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00013.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00013.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00014.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00014.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00015.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00015.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00016.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00016.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00017.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00017.png
diff --git a/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00018.png b/tests/snapshots/stax/test_sign_tx_transfer_with_schedule_legacy_path/00018.png