blooo-io · n4l5u0r · Dec 12, 2024 · Dec 12, 2024
diff --git a/src/common/ui/display_nbgl.c b/src/common/ui/display_nbgl.c
@@ -23,6 +23,16 @@ static void review_choice(bool confirm) {
         nbgl_useCaseReviewStatus(STATUS_TYPE_ADDRESS_REJECTED, ui_menu_main);
     }
 }
+
+static void review_export_private_key(bool confirm) {
+    // Answer, display a status page and go back to main
+    if (confirm) {
+        exportPrivateKey();
+    } else {
+        sendUserRejection();
+    }
+}
+
 static void review_choice_sign(bool confirm) {
     // Answer, display a status page and go back to main
     if (confirm) {
@@ -55,8 +65,29 @@ void uiGeneratePubkey(volatile unsigned int *flags) {
 }
 
 void uiExportPrivateKey(volatile unsigned int *flags) {
+    // Create tag-value pairs for the content
+    uint8_t pairIndex = 0;
+    pairs[pairIndex].item = (char *) global.exportPrivateKeyContext.displayHeader;
+    pairs[pairIndex].value = (char *) global.exportPrivateKeyContext.display;
+    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_OPERATION,
+                       &content,
+                       &C_app_concordium_64px,
+                       "Export Private Key",
+                       NULL,
+                       "Accept",
+                       review_export_private_key);
     *flags |= IO_ASYNCH_REPLY;
-    // TODO: Implement this
 }
 
 void startConfigureBakerCommissionDisplay(void) {

diff --git a/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00000.png b/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00000.png
diff --git a/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00001.png b/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00001.png
diff --git a/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00002.png b/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00002.png
diff --git a/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00003.png b/...apshots/flex/test_export_prfkey_and_idcredsed_private_key_legacy_path/00003.png
diff --git a/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00000.png b/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00000.png
diff --git a/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00001.png b/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00001.png
diff --git a/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00002.png b/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00002.png
diff --git a/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00003.png b/tests/snapshots/flex/test_export_recovery_private_key_legacy_path/00003.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00000.png b/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00000.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00001.png b/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00001.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00002.png b/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00002.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00003.png b/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00003.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00004.png b/tests/snapshots/flex/test_export_standard_private_key_legacy_path/00004.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_new_path/00000.png b/tests/snapshots/flex/test_export_standard_private_key_new_path/00000.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_new_path/00001.png b/tests/snapshots/flex/test_export_standard_private_key_new_path/00001.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_new_path/00002.png b/tests/snapshots/flex/test_export_standard_private_key_new_path/00002.png
diff --git a/tests/snapshots/flex/test_export_standard_private_key_new_path/00003.png b/tests/snapshots/flex/test_export_standard_private_key_new_path/00003.png
diff --git a/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00000.png b/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00000.png
diff --git a/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00001.png b/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00001.png
diff --git a/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00002.png b/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00002.png
diff --git a/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00003.png b/...apshots/stax/test_export_prfkey_and_idcredsed_private_key_legacy_path/00003.png
diff --git a/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00000.png b/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00000.png
diff --git a/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00001.png b/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00001.png
diff --git a/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00002.png b/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00002.png
diff --git a/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00003.png b/tests/snapshots/stax/test_export_recovery_private_key_legacy_path/00003.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00000.png b/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00000.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00001.png b/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00001.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00002.png b/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00002.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00003.png b/tests/snapshots/stax/test_export_standard_private_key_legacy_path/00003.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_new_path/00000.png b/tests/snapshots/stax/test_export_standard_private_key_new_path/00000.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_new_path/00001.png b/tests/snapshots/stax/test_export_standard_private_key_new_path/00001.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_new_path/00002.png b/tests/snapshots/stax/test_export_standard_private_key_new_path/00002.png
diff --git a/tests/snapshots/stax/test_export_standard_private_key_new_path/00003.png b/tests/snapshots/stax/test_export_standard_private_key_new_path/00003.png
diff --git a/tests/test_export_private_key.py b/tests/test_export_private_key.py
@@ -26,7 +26,7 @@ def test_export_standard_private_key_legacy_path(
             "Accept",
             default_screenshot_path,
             test_name,
-            screen_change_before_first_instruction=False,
+            screen_change_before_first_instruction=True,
             screen_change_after_last_instruction=True,
         )
     result = client.get_async_response()
@@ -48,7 +48,7 @@ def test_export_recovery_private_key_legacy_path(
             "Accept",
             default_screenshot_path,
             test_name,
-            screen_change_before_first_instruction=False,
+            screen_change_before_first_instruction=True,
             screen_change_after_last_instruction=True,
         )
     result = client.get_async_response()
@@ -72,7 +72,7 @@ def test_export_prfkey_and_idcredsed_private_key_legacy_path(
             "Accept",
             default_screenshot_path,
             test_name,
-            screen_change_before_first_instruction=False,
+            screen_change_before_first_instruction=True,
             screen_change_after_last_instruction=True,
         )
     result = client.get_async_response()
@@ -96,7 +96,7 @@ def test_export_standard_private_key_new_path(
             "Accept",
             default_screenshot_path,
             test_name,
-            screen_change_before_first_instruction=False,
+            screen_change_before_first_instruction=True,
             screen_change_after_last_instruction=True,
         )
     result = client.get_async_response()