Merge 089ba32 into f8b81a3

lifeomic · Apr 17, 2024 · e768942 · e768942
2 parents f8b81a3 + 089ba32
commit e768942
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 46 deletions.
diff --git a/src/common/LoggedInProviders.tsx b/src/common/LoggedInProviders.tsx
@@ -16,6 +16,7 @@ import { LoginScreen } from '../screens/LoginScreen';
 import { ActivityIndicatorView } from '../components/ActivityIndicatorView';
 import { InviteProvider } from '../components/Invitations/InviteProvider';
 import { t } from 'i18next';
+import AppConfigSwitcher from '../components/AppConfigSwitcher';
 
 export type LoggedInProvidersProps = {
   children?: React.ReactNode;
@@ -53,6 +54,7 @@ export const LoggedInProviders = ({ children }: LoggedInProvidersProps) => {
     <InviteProvider>
       <ActiveProjectContextProvider>
         <AppConfigContextProvider>
+          <AppConfigSwitcher />
           <TrackTileProvider>
             <WearableLifecycleProvider>
               <CircleTileContextProvider>

diff --git a/src/components/AppConfigSwitcher.tsx b/src/components/AppConfigSwitcher.tsx
@@ -1,11 +1,5 @@
 import * as React from 'react';
-import {
-  Appbar,
-  Drawer,
-  IconButton,
-  Portal,
-  Provider,
-} from 'react-native-paper';
+import { Appbar, Drawer, IconButton, Portal } from 'react-native-paper';
 import { useAppConfig, useAppConfigList } from '../hooks/useAppConfig';
 import { Modal, NativeEventEmitter, View } from 'react-native';
 import { createStyles } from './BrandConfigProvider/styles/createStyles';
@@ -43,41 +37,39 @@ const AppConfigSwitcher = () => {
   }, []);
 
   return (
-    <Provider>
-      <Portal>
-        <Modal
-          visible={visible}
-          onDismiss={hideModal}
-          animationType={'slide'}
-          style={styles.modal}
-        >
-          <View style={styles.container}>
-            <Appbar.Header style={styles.header}>
-              <IconButton onPress={() => hideModal()} icon={ArrowLeft} />
-            </Appbar.Header>
-            <Drawer.Section
-              title="Adaptive Experiences: Tailored by Cohort"
-              showDivider={true}
-              titleMaxFontSizeMultiplier={4}
-            >
-              {configs?.map((config) => (
-                <Drawer.Item
-                  key={config.id}
-                  label={config.name}
-                  active={active === config.id}
-                  style={styles.itemText}
-                  onPress={() => {
-                    setActive(config.id);
-                    setAppConfigId(config.id);
-                    setVisible(false);
-                  }}
-                />
-              ))}
-            </Drawer.Section>
-          </View>
-        </Modal>
-      </Portal>
-    </Provider>
+    <Portal>
+      <Modal
+        visible={visible}
+        onDismiss={hideModal}
+        animationType={'slide'}
+        style={styles.modal}
+      >
+        <View style={styles.container}>
+          <Appbar.Header style={styles.header}>
+            <IconButton onPress={() => hideModal()} icon={ArrowLeft} />
+          </Appbar.Header>
+          <Drawer.Section
+            title="Adaptive Experiences: Tailored by Cohort"
+            showDivider={true}
+            titleMaxFontSizeMultiplier={4}
+          >
+            {configs?.map((config) => (
+              <Drawer.Item
+                key={config.id}
+                label={config.name}
+                active={active === config.id}
+                style={styles.itemText}
+                onPress={() => {
+                  setActive(config.id);
+                  setAppConfigId(config.id);
+                  setVisible(false);
+                }}
+              />
+            ))}
+          </Drawer.Section>
+        </View>
+      </Modal>
+    </Portal>
   );
 };
 

diff --git a/src/components/AppConfigSwitcherButton.tsx b/src/components/AppConfigSwitcherButton.tsx
@@ -12,15 +12,15 @@ const AppConfigSwitcherButton = () => {
     <IconButton
       onPress={emitShowAppConfigSwitcher}
       icon={Menu}
-      style={styles.button}
+      style={styles.iconButton}
     />
   );
 };
 
 export default AppConfigSwitcherButton;
 
 const defaultStyles = createStyles('AppConfigSwitcherButton', () => ({
-  button: {},
+  iconButton: {},
 }));
 
 declare module '@styles' {

diff --git a/src/hooks/useAppConfig.tsx b/src/hooks/useAppConfig.tsx
@@ -175,8 +175,6 @@ export const AppConfigContextProvider = ({
   const configList = useAppConfigList();
   const [appConfigId, setAppConfigId] = useState<string | undefined>();
 
-  console.log('ConfigList', configList);
-
   useEffect(() => {
     if (configList) {
       setAppConfigId(configList[0]?.id);