Merge branch 'ACQE-6440' into ACQE-6879-functional-mainline-deployment

Author: manjusha729

app/code/Magento/Paypal/Test/Mftf/Test/AdminCheckoutUsingPaypalInContextWithDifferentCurrenciesTest.xml

@@ -37,8 +37,10 @@
             </actionGroup>
         </before>
         <after>
-            <magentoCLI command="config:set {{SetDefaultCurrencyHKDConfig.path}} {{SetDefaultCurrencyHKDConfig.value}}" stepKey="resetDefaultCurrencyBaseBackToHKD"/>
-            <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForHKD.value}}" stepKey="resetAllowedCurrencyBaseBackToUSD"/>
+            <comment userInput="BIC" stepKey="resetDefaultCurrencyBaseBackToHKD"/>
+            <magentoCLI command="config:set {{SetDefaultCurrencyUSDConfig.path}} {{SetDefaultCurrencyUSDConfig.value}}" stepKey="resetDefaultCurrencyBaseBackToUSD"/>
+            <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}}" stepKey="resetAllowedCurrencyBaseBackToUSD"/>
+            <magentoCLI command="config:set {{SetCurrencyUSDBaseConfig.path}} {{SetCurrencyUSDBaseConfig.value}}" stepKey="setCurrencyBaseUSD"/>
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value="config full_page"/>
             </actionGroup>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenTransactionsTabActionGroup.xml

@@ -24,4 +24,4 @@
         <waitForElementClickable selector="{{AdminTransactionsGridSection.orderTxnTableFirstRow}}" stepKey="clickOnVoidTransaction"/>
         <click selector="{{AdminTransactionsGridSection.orderTxnTableFirstRow}}" stepKey="clickFirstRow"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>