Merge pull request #50 from blooo-io/feat/LDG-620--nano-app-implement…

…-configurebaker-stax-and-flex Feat/ldg 620 nano app implement configurebaker stax and flex
blooo-io · Dec 12, 2024 · dfa3aad · dfa3aad
2 parents a2c06ac + 8fe29eb
commit dfa3aad
Show file tree

Hide file tree

Showing 83 changed files with 217 additions and 8 deletions.
diff --git a/src/common/ui/display_nbgl.c b/src/common/ui/display_nbgl.c
@@ -60,16 +60,216 @@ void uiExportPrivateKey(volatile unsigned int *flags) {
 }
 
 void startConfigureBakerCommissionDisplay(void) {
-    // TODO: Implement this
+    // Get context from global state
+    signConfigureBaker_t *ctx = &global.signConfigureBaker;
+    // Create tag-value pairs for the content
+    uint8_t pairIndex = 0;
+
+    if (ctx->firstDisplay) {
+        // Add sender address
+        pairs[pairIndex].item = "Sender";
+        pairs[pairIndex].value = (char *) global_account_sender.sender;
+        pairIndex++;
+        ctx->firstDisplay = false;
+    }
+
+    if (ctx->hasTransactionFeeCommission || ctx->hasBakingRewardCommission ||
+        ctx->hasFinalizationRewardCommission) {
+        pairs[pairIndex].item = "Commission";
+        pairs[pairIndex].value = "rates";
+        pairIndex++;
+    }
+
+    if (ctx->hasTransactionFeeCommission) {
+        pairs[pairIndex].item = "Transaction fee";
+        pairs[pairIndex].value =
+            (char *) global.signConfigureBaker.commissionRates.transactionFeeCommissionRate;
+        pairIndex++;
+    }
+
+    if (ctx->hasBakingRewardCommission) {
+        pairs[pairIndex].item = "Baking reward";
+        pairs[pairIndex].value =
+            (char *) global.signConfigureBaker.commissionRates.bakingRewardCommissionRate;
+        pairIndex++;
+    }
+
+    if (ctx->hasFinalizationRewardCommission) {
+        pairs[pairIndex].item = "Finalization reward";
+        pairs[pairIndex].value =
+            (char *) global.signConfigureBaker.commissionRates.finalizationRewardCommissionRate;
+        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 startConfigureBakerDisplay(void) {
-    // TODO: Implement this
+    // Get context from global state
+    signConfigureBaker_t *ctx = &global.signConfigureBaker;
+
+    // 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++;
+
+    ctx->firstDisplay = false;
+
+    if (ctx->hasCapital) {
+        if (ctx->capitalRestakeDelegation.stopBaking) {
+            pairs[pairIndex].item = "Stop";
+            pairs[pairIndex].value = "Baking";
+        } else {
+            pairs[pairIndex].item = "Amount to stake";
+            pairs[pairIndex].value =
+                (char *) global.signConfigureBaker.capitalRestakeDelegation.displayCapital;
+        }
+        pairIndex++;
+    }
+
+    if (ctx->hasRestakeEarnings) {
+        pairs[pairIndex].item = "Restake earnings";
+        pairs[pairIndex].value =
+            (char *) global.signConfigureBaker.capitalRestakeDelegation.displayRestake;
+        pairIndex++;
+    }
+
+    if (ctx->hasOpenForDelegation) {
+        pairs[pairIndex].item = "Pool status";
+        pairs[pairIndex].value =
+            (char *) global.signConfigureBaker.capitalRestakeDelegation.displayOpenForDelegation;
+        pairIndex++;
+    }
+
+    if (ctx->hasKeys) {
+        pairs[pairIndex].item = "Update baker";
+        pairs[pairIndex].value = "keys";
+        pairIndex++;
+    }
+
+    PRINTF("GUI: pairIndex: %d\n", pairIndex);
+    // If there are additional steps, then show continue screen. If this is the last step,
+    // then show signing screens.
+    if (ctx->hasMetadataUrl || hasCommissionRate()) {
+        // 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_OPERATION,
+                                &content,
+                                &C_app_concordium_64px,
+                                "Review Transaction",
+                                NULL,  // No subtitle
+                                "Continue with transaction",
+                                sendSuccessNoIdle);
+    } else {
+        // Create the page content
+        PRINTF("GUI: Sign transaction:");
+        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 startConfigureBakerUrlDisplay(bool lastUrlPage) {
-    lastUrlPage = false;
-    // TODO: Implement this
+    // Get context from global state
+    signConfigureBaker_t *ctx = &global.signConfigureBaker;
+
+    // Create tag-value pairs for the content
+    uint8_t pairIndex = 0;
+
+    if (ctx->firstDisplay) {
+        // Add sender address
+        pairs[pairIndex].item = "Sender";
+        pairs[pairIndex].value = (char *) global_account_sender.sender;
+        pairIndex++;
+        ctx->firstDisplay = false;
+    }
+
+    if (!lastUrlPage) {
+        pairs[pairIndex].item = "URL";
+        pairs[pairIndex].value = (char *) global.signConfigureBaker.url.urlDisplay;
+        pairIndex++;
+    } else {
+        if (ctx->url.urlLength == 0) {
+            pairs[pairIndex].item = "Empty URL";
+            pairs[pairIndex].value = "";
+        } else {
+            pairs[pairIndex].item = "URL";
+            pairs[pairIndex].value = (char *) global.signConfigureBaker.url.urlDisplay;
+        }
+        pairIndex++;
+    }
+
+    // If there are additional steps show the continue screen, otherwise go
+    // to signing screens.
+    if (hasCommissionRate()) {
+        // 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_OPERATION,
+                                &content,
+                                &C_app_concordium_64px,
+                                "Review Transaction",
+                                NULL,  // No subtitle
+                                "Continue with transaction",
+                                sendSuccessNoIdle);
+    } else {
+        // 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);
+    }
 }
 
 // TODO: To fix

diff --git a/tests/application_client/boilerplate_command_sender.py b/tests/application_client/boilerplate_command_sender.py
@@ -397,14 +397,13 @@ def sign_configure_baker(
 
         if aggregation_key:
             # Second exchange - using with to wait for completion
-            with self.backend.exchange_async(
+            self.backend.exchange(
                 cla=CLA,
                 ins=InsType.CONFIGURE_BAKER,
                 p1=0x01,
                 p2=P2.P2_NONE,
                 data=transaction,
-            ):
-                pass
+            )
 
             # Final exchange with response yielded to caller
             with self.backend.exchange_async(

diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00000.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00001.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00002.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00003.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00003.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00004.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_1/00004.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_2/00000.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_2/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_2/00001.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_2/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_2/00002.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_2/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00000.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00001.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00002.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00003.png b/tests/snapshots/flex/test_sign_configure_baker_all_parameters_3/00003.png
diff --git a/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00000.png b/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00000.png
diff --git a/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00001.png b/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00001.png
diff --git a/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00002.png b/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00002.png
diff --git a/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00003.png b/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00003.png
diff --git a/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00004.png b/...s/flex/test_sign_configure_baker_capital_restake_open_status_and_keys/00004.png
diff --git a/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00000.png b/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00000.png
diff --git a/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00001.png b/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00001.png
diff --git a/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00002.png b/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00002.png
diff --git a/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00003.png b/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00003.png
diff --git a/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00004.png b/...ex/test_sign_configure_baker_capital_restake_open_status_without_keys/00004.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00000.png b/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00001.png b/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00002.png b/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00003.png b/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00003.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00004.png b/tests/snapshots/flex/test_sign_configure_baker_commission_rate_only/00004.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_only_keys/00000.png b/tests/snapshots/flex/test_sign_configure_baker_only_keys/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_only_keys/00001.png b/tests/snapshots/flex/test_sign_configure_baker_only_keys/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_only_keys/00002.png b/tests/snapshots/flex/test_sign_configure_baker_only_keys/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_only_keys/00003.png b/tests/snapshots/flex/test_sign_configure_baker_only_keys/00003.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00000.png b/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00001.png b/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00002.png b/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00003.png b/tests/snapshots/flex/test_sign_configure_baker_stop_baking/00003.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_url_only/00000.png b/tests/snapshots/flex/test_sign_configure_baker_url_only/00000.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_url_only/00001.png b/tests/snapshots/flex/test_sign_configure_baker_url_only/00001.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_url_only/00002.png b/tests/snapshots/flex/test_sign_configure_baker_url_only/00002.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_url_only/00003.png b/tests/snapshots/flex/test_sign_configure_baker_url_only/00003.png
diff --git a/tests/snapshots/flex/test_sign_configure_baker_url_only/00004.png b/tests/snapshots/flex/test_sign_configure_baker_url_only/00004.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00000.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00001.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00002.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00003.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00003.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00004.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_1/00004.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_2/00000.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_2/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_2/00001.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_2/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_2/00002.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_2/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00000.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00001.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00002.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00003.png b/tests/snapshots/stax/test_sign_configure_baker_all_parameters_3/00003.png
diff --git a/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00000.png b/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00000.png
diff --git a/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00001.png b/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00001.png
diff --git a/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00002.png b/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00002.png
diff --git a/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00003.png b/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00003.png
diff --git a/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00004.png b/...s/stax/test_sign_configure_baker_capital_restake_open_status_and_keys/00004.png
diff --git a/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00000.png b/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00000.png
diff --git a/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00001.png b/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00001.png
diff --git a/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00002.png b/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00002.png
diff --git a/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00003.png b/...ax/test_sign_configure_baker_capital_restake_open_status_without_keys/00003.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00000.png b/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00001.png b/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00002.png b/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00003.png b/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00003.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00004.png b/tests/snapshots/stax/test_sign_configure_baker_commission_rate_only/00004.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_only_keys/00000.png b/tests/snapshots/stax/test_sign_configure_baker_only_keys/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_only_keys/00001.png b/tests/snapshots/stax/test_sign_configure_baker_only_keys/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_only_keys/00002.png b/tests/snapshots/stax/test_sign_configure_baker_only_keys/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_only_keys/00003.png b/tests/snapshots/stax/test_sign_configure_baker_only_keys/00003.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00000.png b/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00001.png b/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00002.png b/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00003.png b/tests/snapshots/stax/test_sign_configure_baker_stop_baking/00003.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_url_only/00000.png b/tests/snapshots/stax/test_sign_configure_baker_url_only/00000.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_url_only/00001.png b/tests/snapshots/stax/test_sign_configure_baker_url_only/00001.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_url_only/00002.png b/tests/snapshots/stax/test_sign_configure_baker_url_only/00002.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_url_only/00003.png b/tests/snapshots/stax/test_sign_configure_baker_url_only/00003.png
diff --git a/tests/snapshots/stax/test_sign_configure_baker_url_only/00004.png b/tests/snapshots/stax/test_sign_configure_baker_url_only/00004.png
diff --git a/tests/test_configure_baker.py b/tests/test_configure_baker.py
@@ -262,6 +262,7 @@ def test_sign_configure_baker_all_parameters(
         NavInsID.RIGHT_CLICK,
         NavInsID.BOTH_CLICK,
     ]
+
     client = BoilerplateCommandSender(backend)
 
     # Create the transaction with all keys
@@ -286,6 +287,10 @@ def test_sign_configure_baker_all_parameters(
                 screen_change_before_first_instruction=False,
                 screen_change_after_last_instruction=False,
             )
+        else:
+            navigate_until_text_and_compare(
+                firmware, navigator, "Continue", default_screenshot_path, test_name + "_1", True, False, NavInsID.USE_CASE_CHOICE_CONFIRM
+            )
     with client.sign_configure_baker_url(
         url=url_bytes, bitmap=bitmap, is_called_first=False
     ):
@@ -297,6 +302,10 @@ def test_sign_configure_baker_all_parameters(
                 screen_change_before_first_instruction=False,
                 screen_change_after_last_instruction=False,
             )
+        else:
+            navigate_until_text_and_compare(
+                firmware, navigator, "Continue", default_screenshot_path, test_name + "_2", True, False, NavInsID.USE_CASE_CHOICE_CONFIRM
+            )
     with client.sign_configure_baker_commission_rate(
         bitmap=bitmap,
         transaction_fee=True,

diff --git a/tests/utils.py b/tests/utils.py
@@ -50,6 +50,7 @@ def navigate_until_text_and_compare(
     test_name: str,
     screen_change_before_first_instruction: bool = True,
     screen_change_after_last_instruction: bool = True,
+    nav_ins_confirm_instruction: NavInsID = NavInsID.USE_CASE_REVIEW_CONFIRM,
 ):
     """Navigate through device screens until specified text is found and compare screenshots.
 
@@ -77,7 +78,7 @@ def navigate_until_text_and_compare(
     """
     if firmware.device.startswith(("stax", "flex")):
         go_right_instruction = NavInsID.SWIPE_CENTER_TO_LEFT
-        confirm_instructions = [NavInsID.USE_CASE_REVIEW_CONFIRM]
+        confirm_instructions = [nav_ins_confirm_instruction]
     else:
         go_right_instruction = NavInsID.RIGHT_CLICK
         confirm_instructions = [NavInsID.BOTH_CLICK]