Merge remote-tracking branch 'origin/main' into chuckdries/ecuk/3ds/fix-invalid-validatecode-error-handling

Author: chuckdries

Mobile-Expensify

@@ -0,0 +1,18 @@
+const setAudioModeAsync = jest.fn(() => Promise.resolve());
+
+const mockPlayer = {
+    play: jest.fn(),
+    pause: jest.fn(),
+    replace: jest.fn(),
+    remove: jest.fn(),
+    addListener: jest.fn(() => ({remove: jest.fn()})),
+};
+
+const createAudioPlayer = jest.fn(() => mockPlayer);
+
+const AudioModule = {
+    requestRecordingPermissionsAsync: jest.fn(() => Promise.resolve({granted: true})),
+};
+
+export {setAudioModeAsync, createAudioPlayer, AudioModule};
+export default {setAudioModeAsync, createAudioPlayer, AudioModule};

__mocks__/expo-audio.ts

@@ -55,7 +55,7 @@ const includeModules = [
     'react-native-view-shot',
     '@react-native/assets',
     'expo',
-    'expo-av',
+    'expo-audio',
     'expo-video',
     'expo-image-manipulator',
     'expo-modules-core',

__mocks__/expo-av.ts

@@ -511,6 +511,7 @@ function StepOne({isEditing, onNext, onMove, formValues}: CustomSubPageProps) {
 ```ts
 import useSubPage from '@hooks/useSubPage';
 import type {SubPageProps} from '@hooks/useSubPage/types';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import InteractiveStepSubPageHeader from '@components/InteractiveStepSubPageHeader';
 
 type CustomSubPageProps = SubPageProps & {
@@ -533,6 +534,7 @@ function MyFlowContent() {
         lastPageIndex,
         moveTo,
         resetToPage,
+        isRedirecting,
     } = useSubPage<CustomSubPageProps>({
         pages,
         startFrom: 0,
@@ -557,6 +559,10 @@ function MyFlowContent() {
         prevPage();
     };
 
+    if (isRedirecting) {
+        return <FullScreenLoadingIndicator />;
+    }
+
     return (
         <ScreenWrapper>
             <HeaderWithBackButton

config/webpack/webpack.common.ts

@@ -0,0 +1,21 @@
+<template id="search-result-item-template">
+    <a class="search-result-item" tabindex="0">
+        <div class="search-result-content">
+            <div class="search-result-title"></div>
+            <div class="search-result-description"></div>
+        </div>
+        <img src="/assets/images/arrow-right.svg" class="base-icon" />
+    </a>
+</template>
+
+<template id="search-loading-template">
+    <div class="search-loading">Searching...</div>
+</template>
+
+<template id="search-no-results-template">
+    <div class="search-no-results">No results found</div>
+</template>
+
+<template id="search-error-template">
+    <div class="search-error">Something went wrong. Please try again.</div>
+</template>

contributingGuides/NAVIGATION.md

@@ -6,8 +6,15 @@
             </a>
             <h4 class="search-title">Search</h4>
         </div>
-        <!-- As the search box is being managed by Embed script from Google, the way search work is on via on Enter / Search Icon -->
-        <div class="gcse-searchbox" data-enableHistory="false"></div>
-        <div class="gcse-searchresults"></div>
+        <form id="search-form" class="search-form" action="#">
+            <label class="search-input-wrapper" for="search-input">
+                <input type="text" id="search-input" class="search-input" required autocomplete="off" />
+                <span class="search-label">Search for something...</span>
+            </label>
+            <button type="submit" id="search-button" class="search-button" aria-label="Search">
+                <img src="/assets/images/search.svg" class="base-icon" />
+            </button>
+        </form>
+        <div id="search-results" class="search-results"></div>
     </div>
 </div>

docs/_includes/search-result-item.html

@@ -17,7 +17,6 @@
     <script defer src="{{ '/assets/js/main.js' | cache_bust }}"></script>
     <script defer src="{{ '/assets/js/platform-tabs.js' | cache_bust }}"></script>
     <script defer src="{{ '/assets/js/selector.js' | cache_bust }}"></script>
-    <script async src="https://cse.google.com/cse.js?cx=4149bc31c5c314a1a"></script>
     <!-- Google Tag Manager -->
     <script>(function (w, d, s, l, i) { w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); })(window, document, 'script', 'dataLayer', 'GTM-TQBQW7CR');</script>
     <!-- End Google Tag Manager -->
@@ -51,6 +50,7 @@
 
         <!-- Sidebar Search sections -->
         {% include sidebar-search.html id="sidebar-layer" %}
+        {% include search-result-item.html %}
 
         <!-- LHN content (Main navigation tree or Article TOC) -->
         <div id="lhn-content">