Skip to content

Bugfix/make-brands-perfect #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rahul-sinha1908 merged 2 commits into from
May 2, 2025
Merged

Bugfix/make-brands-perfect #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9334b1d
Fixed minor changes
rahul-sinha1908 May 2, 2025
6c65b18
Fixed changes for token on messages
rahul-sinha1908 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...)/(onboarding)/onboarding-get-started.tsx → ...)/(onboarding)/onboarding-get-started.tsx
View file
Open in desktop
File renamed without changes.
0 ...s)/(onboarding)/onboarding-your-brand.tsx → ...n)/(onboarding)/onboarding-your-brand.tsx
View file
Open in desktop
File renamed without changes.
20 changes: 0 additions & 20 deletions app/(main)/(screens)/_layout.tsx
View file
Open in desktop

This file was deleted.

63 changes: 41 additions & 22 deletions app/(main)/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,48 @@
import { ChatContextProvider } from "@/contexts";
import { AWSContextProvider, ChatContextProvider, CloudMessagingContextProvider, CollaborationContextProvider, ContractContextProvider, FirebaseStorageContextProvider, NotificationContextProvider } from "@/contexts";
import { BrandContextProvider } from "@/contexts/brand-context.provider";
import { Stack } from "expo-router";
import React from "react";
import { AutocompleteDropdownContextProvider } from "react-native-autocomplete-dropdown";

const MainLayout = () => {
return (
<ChatContextProvider>
<Stack
screenOptions={{
animation: "ios",
headerShown: false,
}}
>
<Stack.Screen
name="(drawer)"
options={{
headerShown: false,
}}
/>
<Stack.Screen
name="(screens)"
options={{
headerShown: false,
}}
/>
</Stack>
</ChatContextProvider>
<AWSContextProvider>
<FirebaseStorageContextProvider>
<NotificationContextProvider>
<CloudMessagingContextProvider>
<BrandContextProvider>
<CollaborationContextProvider>
<ContractContextProvider>
<AutocompleteDropdownContextProvider>
<ChatContextProvider>
<Stack
screenOptions={{
animation: "ios",
headerShown: false,
}}
>
<Stack.Screen
name="(drawer)"
options={{
headerShown: false,
}}
/>
<Stack.Screen
name="(screens)"
options={{
headerShown: false,
}}
/>
</Stack>
</ChatContextProvider>
</AutocompleteDropdownContextProvider>
</ContractContextProvider>
</CollaborationContextProvider>
</BrandContextProvider>
</CloudMessagingContextProvider>
</NotificationContextProvider>
</FirebaseStorageContextProvider>
</AWSContextProvider>
);
};

Expand Down
48 changes: 11 additions & 37 deletions app/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,22 @@ import * as SplashScreen from "expo-splash-screen";
import { useEffect } from "react";

import { GestureHandlerRootView } from "react-native-gesture-handler";
import "react-native-reanimated";
import 'react-native-get-random-values';
import "react-native-reanimated";

import { useColorScheme } from "@/components/theme/useColorScheme";
import CustomPaperTheme from "@/constants/Themes/Theme";
import {
AuthContextProvider,
AWSContextProvider,
CloudMessagingContextProvider,
CollaborationContextProvider,
ContractContextProvider,
FirebaseStorageContextProvider,
NotificationContextProvider,
useAuthContext,
useAuthContext
} from "@/contexts";
import { Provider } from "react-native-paper";
import { AutocompleteDropdownContextProvider } from "react-native-autocomplete-dropdown";
import { BrandContextProvider } from "@/contexts/brand-context.provider";
import CustomPaperTheme from "@/constants/Themes/Theme";
import { queryParams } from "@/utils/url";
import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
import { Platform } from "react-native";
import { resetAndNavigate } from "@/utils/router";
import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
import { Provider } from "react-native-paper";

export {
// Catch any errors thrown by the Layout component.
ErrorBoundary,
ErrorBoundary
} from "expo-router";

export const unstable_settings = {
Expand Down Expand Up @@ -76,27 +66,11 @@ export default function RootLayout() {

return (
<GestureHandlerRootView>
<BottomSheetModalProvider>
<AuthContextProvider>
<AWSContextProvider>
<FirebaseStorageContextProvider>
<NotificationContextProvider>
<CloudMessagingContextProvider>
<BrandContextProvider>
<CollaborationContextProvider>
<ContractContextProvider>
<AutocompleteDropdownContextProvider>
<RootLayoutStack />
</AutocompleteDropdownContextProvider>
</ContractContextProvider>
</CollaborationContextProvider>
</BrandContextProvider>
</CloudMessagingContextProvider>
</NotificationContextProvider>
</FirebaseStorageContextProvider>
</AWSContextProvider>
</AuthContextProvider>
</BottomSheetModalProvider>
<AuthContextProvider>
<BottomSheetModalProvider>
<RootLayoutStack />
</BottomSheetModalProvider>
</AuthContextProvider>
</GestureHandlerRootView>
);
}
Expand Down
6 changes: 5 additions & 1 deletion components/channel/channel-list.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const ChannelListWeb = () => {
}

useEffect(() => {
fetchToken()

window.addEventListener('message', function (event) {
console.log("Received event from ifram");
Expand All @@ -40,6 +39,11 @@ const ChannelListWeb = () => {
});
}, [])

useEffect(() => {
if (manager)
fetchToken()
}, [manager])

if (loading) {
return <AppLayout>
<View style={{ flex: 1, alignItems: "center", padding: 24 }}>
Expand Down
15 changes: 10 additions & 5 deletions layouts/protected/brand-protected-screen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface BrandProtectedScreenProps extends PropsWithChildren { }
const BrandProtectedScreen: React.FC<BrandProtectedScreenProps> = ({
children,
}) => {
const [loading, setLoading] = useState(false);
const [loading, setLoading] = useState(true);
const router = useRouter();

const {
Expand Down Expand Up @@ -59,11 +59,16 @@ const BrandProtectedScreen: React.FC<BrandProtectedScreenProps> = ({
}
}, [manager]);

if (loading) {
return <LoadingScreen />;
}
// if (loading) {
// return <LoadingScreen />;
// }

return <>{children}</>;
return <>
{loading && <LoadingScreen />}
<View style={{ flex: 1, display: loading ? "none" : "flex" }}>
{children}
</View>
</>;
};

const LoadingScreen: React.FC = () => {
Expand Down