Skip to content

Commit

Permalink
Merge pull request #3856 from tloncorp/promote-dev-8-21
Browse files Browse the repository at this point in the history
ops: promote dev 8 21
  • Loading branch information
arthyn authored Aug 21, 2024
2 parents 4113e0b + d3ffe77 commit 7364d70
Show file tree
Hide file tree
Showing 34 changed files with 587 additions and 184 deletions.
1 change: 1 addition & 0 deletions apps/tlon-mobile/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
plugins: [
'@react-native-firebase/app',
'@react-native-firebase/crashlytics',
'@react-native-firebase/perf',
[
'expo-image-picker',
{
Expand Down
3 changes: 2 additions & 1 deletion apps/tlon-mobile/firebase.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"react-native": {
"crashlytics_debug_enabled": false
"crashlytics_debug_enabled": false,
"perf_auto_collection_enabled": false
}
}
20 changes: 18 additions & 2 deletions apps/tlon-mobile/ios/Landscape.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -917,11 +917,13 @@
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseABTesting/FirebaseABTesting_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCrashlytics/FirebaseCrashlytics_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
Expand All @@ -937,11 +939,13 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseABTesting_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCrashlytics_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseRemoteConfig_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
Expand Down Expand Up @@ -1021,11 +1025,13 @@
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseABTesting/FirebaseABTesting_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCrashlytics/FirebaseCrashlytics_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
Expand All @@ -1041,11 +1047,13 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseABTesting_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCrashlytics_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseRemoteConfig_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
Expand Down Expand Up @@ -1841,7 +1849,11 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -1934,7 +1946,11 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
47 changes: 46 additions & 1 deletion apps/tlon-mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ PODS:
- Firebase/Crashlytics (10.24.0):
- Firebase/CoreOnly
- FirebaseCrashlytics (~> 10.24.0)
- Firebase/Performance (10.24.0):
- Firebase/CoreOnly
- FirebasePerformance (~> 10.24.0)
- FirebaseABTesting (10.29.0):
- FirebaseCore (~> 10.0)
- FirebaseCore (10.24.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
Expand All @@ -184,6 +189,24 @@ PODS:
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- FirebasePerformance (10.24.0):
- FirebaseCore (~> 10.5)
- FirebaseInstallations (~> 10.0)
- FirebaseRemoteConfig (~> 10.0)
- FirebaseSessions (~> 10.5)
- GoogleDataTransport (~> 9.2)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/ISASwizzler (~> 7.8)
- GoogleUtilities/MethodSwizzler (~> 7.8)
- nanopb (< 2.30911.0, >= 2.30908.0)
- FirebaseRemoteConfig (10.29.0):
- FirebaseABTesting (~> 10.0)
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- FirebaseRemoteConfigInterop (~> 10.23)
- FirebaseSharedSwift (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseRemoteConfigInterop (10.29.0)
- FirebaseSessions (10.29.0):
- FirebaseCore (~> 10.5)
Expand All @@ -194,6 +217,7 @@ PODS:
- GoogleUtilities/UserDefaults (~> 7.13)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesSwift (~> 2.1)
- FirebaseSharedSwift (10.29.0)
- fmt (6.2.1)
- glog (0.3.5)
- GoogleDataTransport (9.4.1):
Expand All @@ -203,9 +227,14 @@ PODS:
- GoogleUtilities/Environment (7.13.3):
- GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/ISASwizzler (7.13.3):
- GoogleUtilities/Privacy
- GoogleUtilities/Logger (7.13.3):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- GoogleUtilities/MethodSwizzler (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- "GoogleUtilities/NSData+zlib (7.13.3)":
- GoogleUtilities/Privacy
- GoogleUtilities/Privacy (7.13.3)
Expand Down Expand Up @@ -1323,6 +1352,10 @@ PODS:
- FirebaseCoreExtension
- React-Core
- RNFBApp
- RNFBPerf (19.2.2):
- Firebase/Performance (= 10.24.0)
- React-Core
- RNFBApp
- RNGestureHandler (2.18.1):
- glog
- RCT-Folly (= 2022.05.16.00)
Expand Down Expand Up @@ -1457,6 +1490,7 @@ DEPENDENCIES:
- RNDeviceInfo (from `../../../node_modules/react-native-device-info`)
- "RNFBApp (from `../../../node_modules/@react-native-firebase/app`)"
- "RNFBCrashlytics (from `../../../node_modules/@react-native-firebase/crashlytics`)"
- "RNFBPerf (from `../../../node_modules/@react-native-firebase/perf`)"
- RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`)
- RNReanimated (from `../../../node_modules/react-native-reanimated`)
- RNScreens (from `../../../node_modules/react-native-screens`)
Expand All @@ -1469,13 +1503,17 @@ SPEC REPOS:
trunk:
- BranchSDK
- Firebase
- FirebaseABTesting
- FirebaseCore
- FirebaseCoreExtension
- FirebaseCoreInternal
- FirebaseCrashlytics
- FirebaseInstallations
- FirebasePerformance
- FirebaseRemoteConfig
- FirebaseRemoteConfigInterop
- FirebaseSessions
- FirebaseSharedSwift
- fmt
- GoogleDataTransport
- GoogleUtilities
Expand Down Expand Up @@ -1685,6 +1723,8 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/@react-native-firebase/app"
RNFBCrashlytics:
:path: "../../../node_modules/@react-native-firebase/crashlytics"
RNFBPerf:
:path: "../../../node_modules/@react-native-firebase/perf"
RNGestureHandler:
:path: "../../../node_modules/react-native-gesture-handler"
RNReanimated:
Expand Down Expand Up @@ -1740,13 +1780,17 @@ SPEC CHECKSUMS:
FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7
FBReactNativeSpec: 4b31c1954525bc2e3a5df4cbbd06fc7ae9191b11
Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
FirebaseCrashlytics: af38ea4adfa606f6e63fcc22091b61e7938fcf66
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
FirebasePerformance: 78fed7cf7907f67af3c1e9667d2d1881765f11e2
FirebaseRemoteConfig: 48ef3f243742a8d72422ccfc9f986e19d7de53fd
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
Expand Down Expand Up @@ -1817,6 +1861,7 @@ SPEC CHECKSUMS:
RNDeviceInfo: db5c64a060e66e5db3102d041ebe3ef307a85120
RNFBApp: 91311b27bc9a33e23b76a62825afd1635501018a
RNFBCrashlytics: c3219ef7a0c779f2428236215781c38e7892f6f9
RNFBPerf: 2c926ff255c704a644dd53572008cba47c67ada0
RNGestureHandler: f42730cc5dc0b50e2b6409e259e8c238356ec0d0
RNReanimated: fb34efce9255966f5d71bd0fc65e14042c4b88a9
RNScreens: 2b73f5eb2ac5d94fbd61fa4be0bfebd345716825
Expand All @@ -1829,7 +1874,7 @@ SPEC CHECKSUMS:
sqlite3: f163dbbb7aa3339ad8fc622782c2d9d7b72f7e9c
tentap: fc7669734b4dea745d6e56f57f5c7dc4fc2977bc
UMAppLoader: 5df85360d65cabaef544be5424ac64672e648482
Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70

PODFILE CHECKSUM: 0cb7a78e5777e69c86c1bf4bb5135fd660376dbe

Expand Down
1 change: 1 addition & 0 deletions apps/tlon-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"@react-native-community/netinfo": "11.1.0",
"@react-native-firebase/app": "^19.2.2",
"@react-native-firebase/crashlytics": "^19.2.2",
"@react-native-firebase/perf": "19.2.2",
"@react-navigation/bottom-tabs": "^6.5.12",
"@react-navigation/native": "^6.1.7",
"@react-navigation/native-stack": "^6.9.13",
Expand Down
73 changes: 38 additions & 35 deletions apps/tlon-mobile/src/App.main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { useIsDarkMode } from '@tloncorp/app/hooks/useIsDarkMode';
import { useScreenOptions } from '@tloncorp/app/hooks/useScreenOptions';
import { useMigrations } from '@tloncorp/app/lib/nativeDb';
import { Provider as TamaguiProvider } from '@tloncorp/app/provider';
import { FeatureFlagConnectedInstrumentationProvider } from '@tloncorp/app/utils/perf';
import { posthogAsync } from '@tloncorp/app/utils/posthog';
import { QueryClientProvider, queryClient } from '@tloncorp/shared/dist/api';
import { PortalProvider } from '@tloncorp/ui';
Expand Down Expand Up @@ -213,42 +214,44 @@ export default function ConnectedApp(props: Props) {

return (
<ErrorBoundary>
<TamaguiProvider defaultTheme={isDarkMode ? 'dark' : 'light'}>
<ShipProvider>
<NavigationContainer
theme={isDarkMode ? DarkTheme : DefaultTheme}
ref={navigationContainerRef}
>
<BranchProvider>
<PostHogProvider
client={posthogAsync}
autocapture
options={{
enable: process.env.NODE_ENV !== 'test',
}}
>
<GestureHandlerRootView style={tailwind('flex-1')}>
<SafeAreaProvider>
<MigrationCheck>
<QueryClientProvider client={queryClient}>
<PortalProvider>
<App {...props} />
</PortalProvider>
<FeatureFlagConnectedInstrumentationProvider>
<TamaguiProvider defaultTheme={isDarkMode ? 'dark' : 'light'}>
<ShipProvider>
<NavigationContainer
theme={isDarkMode ? DarkTheme : DefaultTheme}
ref={navigationContainerRef}
>
<BranchProvider>
<PostHogProvider
client={posthogAsync}
autocapture
options={{
enable: process.env.NODE_ENV !== 'test',
}}
>
<GestureHandlerRootView style={tailwind('flex-1')}>
<SafeAreaProvider>
<MigrationCheck>
<QueryClientProvider client={queryClient}>
<PortalProvider>
<App {...props} />
</PortalProvider>

{__DEV__ && (
<DevTools
navigationContainerRef={navigationContainerRef}
/>
)}
</QueryClientProvider>
</MigrationCheck>
</SafeAreaProvider>
</GestureHandlerRootView>
</PostHogProvider>
</BranchProvider>
</NavigationContainer>
</ShipProvider>
</TamaguiProvider>
{__DEV__ && (
<DevTools
navigationContainerRef={navigationContainerRef}
/>
)}
</QueryClientProvider>
</MigrationCheck>
</SafeAreaProvider>
</GestureHandlerRootView>
</PostHogProvider>
</BranchProvider>
</NavigationContainer>
</ShipProvider>
</TamaguiProvider>
</FeatureFlagConnectedInstrumentationProvider>
</ErrorBoundary>
);
}
Expand Down
8 changes: 4 additions & 4 deletions apps/tlon-mobile/src/components/AuthenticatedApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import crashlytics from '@react-native-firebase/crashlytics';
import { useShip } from '@tloncorp/app/contexts/ship';
import useAppForegrounded from '@tloncorp/app/hooks/useAppForegrounded';
import { useCurrentUserId } from '@tloncorp/app/hooks/useCurrentUser';
import { useDeepLinkListener } from '@tloncorp/app/hooks/useDeepLinkListener';
import { useNavigationLogging } from '@tloncorp/app/hooks/useNavigationLogger';
import { useNetworkLogger } from '@tloncorp/app/hooks/useNetworkLogger';
import useNotificationListener, {
type Props as NotificationListenerProps,
} from '@tloncorp/app/hooks/useNotificationListener';
import { configureClient } from '@tloncorp/app/lib/api';
import { PlatformState } from '@tloncorp/app/lib/platformHelpers';
import { initializeCrashReporter, sync } from '@tloncorp/shared';
import * as store from '@tloncorp/shared/dist/store';
import { ZStack } from '@tloncorp/ui';
import { useEffect } from 'react';

import { useDeepLinkListener } from '../hooks/useDeepLinkListener';
import useNotificationListener, {
type Props as NotificationListenerProps,
} from '../hooks/useNotificationListener';
import { RootStack } from '../navigation/RootStack';

export interface AuthenticatedAppProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import { useNavigation } from '@react-navigation/native';
import type { NavigationProp } from '@react-navigation/native';
// import { parseActiveTab } from '@tloncorp/shared';
import { useBranch } from '@tloncorp/app/contexts/branch';
import { useShip } from '@tloncorp/app/contexts/ship';
import { inviteShipWithLure } from '@tloncorp/app/lib/hostingApi';
import { trackError } from '@tloncorp/app/utils/posthog';
import { useEffect } from 'react';
import { Alert } from 'react-native';

import { useBranch } from '../contexts/branch';
import { useShip } from '../contexts/ship';
import { inviteShipWithLure } from '../lib/hostingApi';
// import type { RootStackParamList } from '../types';
import { trackError } from '../utils/posthog';
import { RootStackParamList } from '../types';

export const useDeepLinkListener = () => {
// @ts-expect-error - TODO: pass navigation handler to hook
const navigation = useNavigation<NavigationProp<RootStackParamList>>();
const { ship } = useShip();
const { lure, deepLinkPath, clearLure, clearDeepLink } = useBranch();
Expand Down
Loading

0 comments on commit 7364d70

Please sign in to comment.