attempt to fix flaky tests

Author: syadupathi-sf

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-contact-info.test.js

@@ -177,6 +177,11 @@ describe('ContactInfo Component', () => {
     test('updates checkout contact phone when user types phone (guest)', async () => {
         const {user} = renderWithProviders(<ContactInfo />)
         const phoneInput = screen.getByLabelText('Phone')
+        // Wait for ContactInfo's auto-focus on email (100ms) to run first so it doesn't
+        // steal focus during user.type() and send keystrokes to the email field (CI race).
+        await act(async () => {
+            await new Promise((r) => setTimeout(r, 150))
+        })
         // Type the phone number and wait for it to be formatted
         await user.type(phoneInput, '7275551234')
         // Wait for the phone input to have a value (formatted phone number)

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-payment.test.js

@@ -1348,8 +1348,14 @@ describe('Payment Component', () => {
                     }
                 ]
             }
-            render(<TestWrapper isRegistered={true} customerData={customerWithSaved} />)
-            // Wait for form to appear (auto-apply may temporarily hide it)
+            // Use isEditing so auto-apply is skipped and the form stays visible (avoids CI race)
+            render(
+                <TestWrapper
+                    isRegistered={true}
+                    customerData={customerWithSaved}
+                    isEditing={true}
+                />
+            )
             await screen.findByTestId('payment-form')
             await user.click(screen.getByText('Select Saved'))
             // If no error thrown, the path executed successfully
@@ -1383,11 +1389,13 @@ describe('Payment Component', () => {
                     }
                 ]
             }
+            // Use isEditing so auto-apply is skipped and the form stays visible (avoids CI race)
             render(
                 <TestWrapper
                     basketData={pickupBasket}
                     isRegistered={true}
                     customerData={customerWithSaved}
+                    isEditing={true}
                 />
             )
             await screen.findByTestId('payment-form')