Skip to content

Commit 5944e44

Browse files
Merge upstream develop
2 parents 9585d55 + 9574e4f commit 5944e44

6 files changed

Lines changed: 113 additions & 105 deletions

File tree

apps/polycentric/app/_layout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ function RootStack() {
5252
...); deep-linked profile/post views stay public everywhere. On
5353
web the tabs stay routable and get granular guards instead. */}
5454
<Stack.Protected guard={isWeb || accountGuard}>
55-
<Stack.Screen name="(tabs)" />
55+
<Stack.Screen name="(tabs)" options={{ animation: 'none' }} />
5656
</Stack.Protected>
5757

58-
<Stack.Screen name="(onboarding)" />
58+
<Stack.Screen name="(onboarding)" options={{ animation: 'none' }} />
5959

6060
{/* Account-only on every platform. Routes are auto-registered from
6161
the filesystem; the explicit declarations here exist to place

apps/polycentric/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"react-native-qrcode-svg": "^6.3.21",
7171
"react-native-reanimated": "4.5.0",
7272
"react-native-safe-area-context": "5.7.0",
73-
"react-native-screens": "~4.25.2",
73+
"react-native-screens": "~4.26.2",
7474
"react-native-svg": "15.15.5",
7575
"react-native-toast-message": "^2.3.3",
7676
"react-native-vision-camera": "^5.0.0",

apps/polycentric/src/common/theme/provider.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
type PropsWithChildren,
1515
} from 'react';
1616
import { Appearance, useColorScheme } from 'react-native';
17+
import * as SystemUI from 'expo-system-ui';
1718
import { useSettings } from '@/src/common/settings';
1819
import { themes, type Theme, type ThemeKey } from './themes';
1920

@@ -55,6 +56,13 @@ export function ThemeProvider({ children }: PropsWithChildren) {
5556

5657
const theme = useMemo(() => themes[activeThemeName], [activeThemeName]);
5758

59+
// Keep the native window background in sync with the theme so the
60+
// moments where no surface has painted (splash dismissal, stack
61+
// transitions) don't flash the default white window.
62+
useEffect(() => {
63+
void SystemUI.setBackgroundColorAsync(theme.palette.neutral_0);
64+
}, [theme]);
65+
5866
const value = useMemo(
5967
() => ({ theme, activeThemeName, setActiveThemeName }),
6068
[theme, activeThemeName, setActiveThemeName],

apps/polycentric/src/features/profile/ProfileContext.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,13 @@ export function ProfileProvider({
5050
if (tab === activeFeed) return;
5151
navigation.dispatch({
5252
type: 'JUMP_TO',
53-
payload: { name: tab === 'verifications' ? 'verifications' : 'index' },
53+
payload: {
54+
name: tab === 'verifications' ? 'verifications' : 'index',
55+
params: { identityId: alias ?? identityKey },
56+
},
5457
});
5558
},
56-
[activeFeed, navigation],
59+
[activeFeed, alias, identityKey, navigation],
5760
);
5861

5962
const value = useMemo<ProfileContextValue>(

0 commit comments

Comments
 (0)