refactor: resolved conflict issues

src/MainApp.jsx

@@ -37,15 +37,14 @@ const MainApp = () => {
   const recaptchaSiteKeyWeb = getConfig().RECAPTCHA_SITE_KEY_WEB;
 
   return (
-    <AppProvider store={configureStore()}>
-      <GoogleReCaptchaProvider
+     <GoogleReCaptchaProvider
         reCaptchaKey={recaptchaSiteKeyWeb}
         useEnterprise
       >
+      <AppProvider store={configureStore()}>
         <Helmet>
           <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
         </Helmet>
-        {getConfig().ZENDESK_KEY && <Zendesk />}
         <Routes>
           <Route path="/" element={<Navigate replace to={updatePathWithQueryParams(REGISTER_PAGE)} />} />
           <Route
@@ -66,8 +65,10 @@ const MainApp = () => {
           <Route path={PAGE_NOT_FOUND} element={<NotFoundPage />} />
           <Route path="*" element={<Navigate replace to={PAGE_NOT_FOUND} />} />
         </Routes>
-      </GoogleReCaptchaProvider>
-    </AppProvider>
+        <RouteTracker />
+        <MainAppSlot />
+      </AppProvider>
+    </GoogleReCaptchaProvider>
   );
 };
 

src/register/RegistrationPage.jsx

@@ -411,6 +411,7 @@ const RegistrationPage = (props) => {
                   setFormFields={setConfigurableFormFields}
                   autoSubmitRegisterForm={autoSubmitRegForm}
                   fieldDescriptions={fieldDescriptions}
+                  countriesCodesList={countriesCodesList}
                 />
                 {captchaError && (
                   <div className="mt-3 pgn__form-text-invalid pgn__form-text">

src/register/components/tests/ConfigurableRegistrationForm.test.jsx

@@ -9,7 +9,6 @@ import { useGoogleReCaptcha } from 'react-google-recaptcha-v3';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
-import { APP_NAME } from '../../../data/constants';
 import { registerNewUser } from '../../data/actions';
 import { FIELDS } from '../../data/constants';
 import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';