Page MenuHomePhabricator

D13710.diff
No OneTemporary

D13710.diff

diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -333,33 +333,33 @@
<StaffContextProvider>
<IdentityServiceContextProvider>
<UserIdentityCacheProvider>
- <TunnelbrokerProvider>
- <IdentitySearchProvider>
- <QRAuthProvider
- parseTunnelbrokerQRAuthMessage={
- parseTunnelbrokerQRAuthMessage
- }
- composeTunnelbrokerQRAuthMessage={
- composeTunnelbrokerQRAuthMessage
- }
- generateAESKey={generateQRAuthAESKey}
- performBackupRestore={performBackupRestore}
- onLogInError={handleSecondaryDeviceLogInError}
- >
- <FeatureFlagsProvider>
- <NavContext.Provider value={navContext}>
- <RootContext.Provider value={rootContext}>
- <InputStateContainer>
- <MessageEditingContextProvider>
- <SafeAreaProvider
- initialMetrics={initialWindowMetrics}
- >
- <ActionSheetProvider>
- <ENSCacheProvider
- ethersProvider={ethersProvider}
- alchemyKey={alchemyKey}
+ <ENSCacheProvider
+ ethersProvider={ethersProvider}
+ alchemyKey={alchemyKey}
+ >
+ <NeynarClientProvider apiKey={neynarKey}>
+ <TunnelbrokerProvider>
+ <IdentitySearchProvider>
+ <QRAuthProvider
+ parseTunnelbrokerQRAuthMessage={
+ parseTunnelbrokerQRAuthMessage
+ }
+ composeTunnelbrokerQRAuthMessage={
+ composeTunnelbrokerQRAuthMessage
+ }
+ generateAESKey={generateQRAuthAESKey}
+ performBackupRestore={performBackupRestore}
+ onLogInError={handleSecondaryDeviceLogInError}
+ >
+ <FeatureFlagsProvider>
+ <NavContext.Provider value={navContext}>
+ <RootContext.Provider value={rootContext}>
+ <InputStateContainer>
+ <MessageEditingContextProvider>
+ <SafeAreaProvider
+ initialMetrics={initialWindowMetrics}
>
- <NeynarClientProvider apiKey={neynarKey}>
+ <ActionSheetProvider>
<MediaCacheProvider
persistence={filesystemMediaCache}
>
@@ -400,18 +400,18 @@
</NativeEditThreadAvatarProvider>
</EditUserAvatarProvider>
</MediaCacheProvider>
- </NeynarClientProvider>
- </ENSCacheProvider>
- </ActionSheetProvider>
- </SafeAreaProvider>
- </MessageEditingContextProvider>
- </InputStateContainer>
- </RootContext.Provider>
- </NavContext.Provider>
- </FeatureFlagsProvider>
- </QRAuthProvider>
- </IdentitySearchProvider>
- </TunnelbrokerProvider>
+ </ActionSheetProvider>
+ </SafeAreaProvider>
+ </MessageEditingContextProvider>
+ </InputStateContainer>
+ </RootContext.Provider>
+ </NavContext.Provider>
+ </FeatureFlagsProvider>
+ </QRAuthProvider>
+ </IdentitySearchProvider>
+ </TunnelbrokerProvider>
+ </NeynarClientProvider>
+ </ENSCacheProvider>
</UserIdentityCacheProvider>
</IdentityServiceContextProvider>
</StaffContextProvider>
diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -239,33 +239,29 @@
<DndProvider backend={HTML5Backend}>
<EditModalProvider>
<MenuProvider>
- <AlchemyENSCacheProvider>
- <NeynarClientProvider apiKey={process.env.COMM_NEYNAR_KEY}>
- <TooltipProvider>
- <MessageSearchStateProvider>
- <ChatMentionContextProvider>
- <FocusHandler />
- <VisibilityHandler />
- <PolicyAcknowledgmentHandler />
- <PushNotificationsHandler />
- <InviteLinkHandler />
- <InviteLinksRefresher />
- <CommunitiesRefresher />
- <MinVersionHandler />
- <PlatformDetailsSynchronizer />
- <LogOutIfMissingCSATHandler />
- <UserInfosHandler />
- <TunnelbrokerDeviceTokenHandler />
- <FarcasterDataHandler />
- <AutoJoinCommunityHandler />
- <DMActivityHandler />
- <HoldersHandler />
- {content}
- </ChatMentionContextProvider>
- </MessageSearchStateProvider>
- </TooltipProvider>
- </NeynarClientProvider>
- </AlchemyENSCacheProvider>
+ <TooltipProvider>
+ <MessageSearchStateProvider>
+ <ChatMentionContextProvider>
+ <FocusHandler />
+ <VisibilityHandler />
+ <PolicyAcknowledgmentHandler />
+ <PushNotificationsHandler />
+ <InviteLinkHandler />
+ <InviteLinksRefresher />
+ <CommunitiesRefresher />
+ <MinVersionHandler />
+ <PlatformDetailsSynchronizer />
+ <LogOutIfMissingCSATHandler />
+ <UserInfosHandler />
+ <TunnelbrokerDeviceTokenHandler />
+ <FarcasterDataHandler />
+ <AutoJoinCommunityHandler />
+ <DMActivityHandler />
+ <HoldersHandler />
+ {content}
+ </ChatMentionContextProvider>
+ </MessageSearchStateProvider>
+ </TooltipProvider>
</MenuProvider>
</EditModalProvider>
</DndProvider>
@@ -558,34 +554,40 @@
return (
<AppThemeWrapper>
- <TunnelbrokerProvider
- shouldBeClosed={lockStatus !== 'acquired'}
- onClose={releaseLockOrAbortRequest}
- secondaryTunnelbrokerConnection={secondaryTunnelbrokerConnection}
- >
- <BadgeHandler />
- <IdentitySearchProvider>
- <QRAuthProvider
- parseTunnelbrokerQRAuthMessage={parseTunnelbrokerQRAuthMessage}
- composeTunnelbrokerQRAuthMessage={
- composeTunnelbrokerQRAuthMessage
- }
- generateAESKey={generateQRAuthAESKey}
- onLogInError={handleSecondaryDeviceLogInError}
+ <AlchemyENSCacheProvider>
+ <NeynarClientProvider apiKey={process.env.COMM_NEYNAR_KEY}>
+ <TunnelbrokerProvider
+ shouldBeClosed={lockStatus !== 'acquired'}
+ onClose={releaseLockOrAbortRequest}
+ secondaryTunnelbrokerConnection={secondaryTunnelbrokerConnection}
>
- <App
- {...props}
- navInfo={navInfo}
- entriesLoadingStatus={entriesLoadingStatus}
- loggedIn={loggedIn}
- activeThreadCurrentlyUnread={activeThreadCurrentlyUnread}
- dispatch={dispatch}
- modals={modals}
- />
- </QRAuthProvider>
- <DBOpsHandler />
- </IdentitySearchProvider>
- </TunnelbrokerProvider>
+ <BadgeHandler />
+ <IdentitySearchProvider>
+ <QRAuthProvider
+ parseTunnelbrokerQRAuthMessage={
+ parseTunnelbrokerQRAuthMessage
+ }
+ composeTunnelbrokerQRAuthMessage={
+ composeTunnelbrokerQRAuthMessage
+ }
+ generateAESKey={generateQRAuthAESKey}
+ onLogInError={handleSecondaryDeviceLogInError}
+ >
+ <App
+ {...props}
+ navInfo={navInfo}
+ entriesLoadingStatus={entriesLoadingStatus}
+ loggedIn={loggedIn}
+ activeThreadCurrentlyUnread={activeThreadCurrentlyUnread}
+ dispatch={dispatch}
+ modals={modals}
+ />
+ </QRAuthProvider>
+ <DBOpsHandler />
+ </IdentitySearchProvider>
+ </TunnelbrokerProvider>
+ </NeynarClientProvider>
+ </AlchemyENSCacheProvider>
</AppThemeWrapper>
);
},

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 8:14 PM (19 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2696212
Default Alt Text
D13710.diff (9 KB)

Event Timeline