Merge branch 'develop' into po/tlon-3223-move-fixtures-to-app-package

tloncorp · Nov 15, 2024 · a1337be · a1337be
2 parents 363f018 + b76ab9e
commit a1337be
Show file tree

Hide file tree

Showing 42 changed files with 535 additions and 285 deletions.
diff --git a/.github/workflows/mobile-update.yml b/.github/workflows/mobile-update.yml
@@ -60,3 +60,4 @@ jobs:
           RECAPTCHA_SITE_KEY_ANDROID: ${{ secrets.RECAPTCHA_SITE_KEY_ANDROID }}
           RECAPTCHA_SITE_KEY_IOS: ${{ secrets.RECAPTCHA_SITE_KEY_IOS }}
           TLON_EMPLOYEE_GROUP: ${{ secrets.TLON_EMPLOYEE_GROUP }}
+          INVITE_SERVICE_ENDPOINT: ${{ secrets.INVITE_SERVICE_ENDPOINT }}
diff --git a/apps/tlon-mobile/android/app/build.gradle b/apps/tlon-mobile/android/app/build.gradle
@@ -88,7 +88,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         compileSdk rootProject.ext.compileSdkVersion
         versionCode 108
-        versionName "4.1.7"
+        versionName "4.2.0"
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
     }

diff --git a/apps/tlon-mobile/app.config.ts b/apps/tlon-mobile/app.config.ts
@@ -51,6 +51,8 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     branchDomain: isPreview
       ? process.env.BRANCH_DOMAIN_TEST
       : process.env.BRANCH_DOMAIN_PROD,
+    inviteServiceEndpoint: process.env.INVITE_SERVICE_ENDPOINT,
+    inviteServiceIsDev: process.env.INVITE_SERVICE_IS_DEV,
   },
   ios: {
     runtimeVersion: '4.0.2',

diff --git a/apps/tlon-mobile/ios/Landscape.xcodeproj/project.pbxproj b/apps/tlon-mobile/ios/Landscape.xcodeproj/project.pbxproj
@@ -1427,7 +1427,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.1.7;
+				MARKETING_VERSION = 4.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1465,7 +1465,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.1.7;
+				MARKETING_VERSION = 4.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1689,7 +1689,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.1.7;
+				MARKETING_VERSION = 4.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1732,7 +1732,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.1.7;
+				MARKETING_VERSION = 4.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/apps/tlon-mobile/src/fixtures/Onboarding.fixture.tsx b/apps/tlon-mobile/src/fixtures/Onboarding.fixture.tsx
@@ -1,15 +1,8 @@
 import { NavigationContainer } from '@react-navigation/native';
-import {
-  Context as BranchContext,
-  LureData,
-} from '@tloncorp/app/contexts/branch';
 import { exampleContacts } from '@tloncorp/app/fixtures/contentHelpers';
 import { group } from '@tloncorp/app/fixtures/fakeData';
-import {
-  DeepLinkData,
-  QueryClientProvider,
-  queryClient,
-} from '@tloncorp/shared';
+import { Context as BranchContext } from '@tloncorp/app/contexts/branch';
+import { AppInvite, QueryClientProvider, queryClient } from '@tloncorp/shared';
 import { Theme } from '@tloncorp/ui';
 import { PropsWithChildren, useState } from 'react';
 import { useFixtureSelect } from 'react-cosmos/client';
@@ -47,7 +40,7 @@ function OnboardingFixture({
   hasGroupInvite,
   children,
 }: PropsWithChildren<{ hasGroupInvite: boolean }>) {
-  const [lure, setLure] = useState<LureData | undefined>(
+  const [lure, setLure] = useState<AppInvite | undefined>(
     hasGroupInvite
       ? {
           id: group.id,
@@ -108,7 +101,7 @@ function OnboardingFixture({
           <BranchContext.Provider
             value={{
               lure,
-              setLure: setLure as unknown as (data: DeepLinkData) => void,
+              setLure: setLure as unknown as (lure: AppInvite) => void,
               clearLure: () => setLure(undefined),
               clearDeepLink: () => {},
               deepLinkPath: undefined,

diff --git a/apps/tlon-mobile/src/lib/signupContext.tsx b/apps/tlon-mobile/src/lib/signupContext.tsx
@@ -7,13 +7,15 @@ import { createDevLogger } from '@tloncorp/shared';
 import * as api from '@tloncorp/shared/api';
 import { SignupParams, didSignUp, signupData } from '@tloncorp/shared/db';
 import * as store from '@tloncorp/shared/store';
+import PostHog, { usePostHog } from 'posthog-react-native';
 import {
   createContext,
   useCallback,
   useContext,
   useEffect,
   useState,
 } from 'react';
+import branch from 'react-native-branch';
 
 const logger = createDevLogger('signup', true);
 
@@ -56,6 +58,7 @@ export const SignupProvider = ({ children }: { children: React.ReactNode }) => {
   const [reviveCheckComplete, setReviveCheckComplete] = useState(false);
   const { bootPhase, bootReport, kickOffBootSequence } =
     useBootSequence(values);
+  const postHog = usePostHog();
 
   const setOnboardingValues = useCallback(
     (newValues: Partial<SignupValues>) => {
@@ -80,6 +83,7 @@ export const SignupProvider = ({ children }: { children: React.ReactNode }) => {
         nickname: values.nickname,
         telemetry: values.telemetry,
         notificationToken: values.notificationToken,
+        postHog,
       };
       runPostSignupActions(postSignupParams);
       logger.trackEvent('hosted signup report', {
@@ -139,6 +143,7 @@ async function runPostSignupActions(params: {
   nickname?: string;
   telemetry?: boolean;
   notificationToken?: string;
+  postHog?: PostHog;
 }) {
   if (params.nickname) {
     try {
@@ -156,6 +161,15 @@ async function runPostSignupActions(params: {
   if (typeof params.telemetry !== 'undefined') {
     try {
       await api.updateTelemetrySetting(params.telemetry);
+      if (!params.telemetry) {
+        // we give some wiggle room here before disabling telemetry to allow
+        // the initial signup flow to complete before severing analytics
+        const tenMinutes = 10 * 60 * 1000;
+        setTimeout(() => {
+          params.postHog?.optOut();
+          branch.disableTracking(true);
+        }, tenMinutes);
+      }
     } catch (e) {
       logger.trackError('post signup: failed to set telemetry', {
         errorMessage: e.message,

diff --git a/apps/tlon-mobile/src/screens/Onboarding/CheckOTPScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/CheckOTPScreen.tsx
@@ -175,6 +175,7 @@ export const CheckOTPScreen = ({ navigation, route: { params } }: Props) => {
           phoneNumber:
             otpMethod === 'phone' ? signupContext.phoneNumber! : undefined,
           email: otpMethod === 'email' ? signupContext.email! : undefined,
+          hostingUser: user,
         });
         navigation.navigate('ReserveShip', { user });
       }

diff --git a/apps/tlon-mobile/src/screens/Onboarding/PasteInviteLinkScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/PasteInviteLinkScreen.tsx
@@ -11,7 +11,7 @@ import {
   DeepLinkData,
   createInviteLinkRegex,
   extractNormalizedInviteLink,
-  getMetadaFromInviteLink,
+  getInviteLinkMeta,
 } from '@tloncorp/shared';
 import {
   Field,
@@ -68,12 +68,13 @@ export const PasteInviteLinkScreen = ({ navigation }: Props) => {
       setMetadataError(null);
       if (extractedLink) {
         try {
-          const inviteLinkMeta = await getMetadaFromInviteLink(
-            extractedLink,
-            BRANCH_KEY
-          );
-          if (inviteLinkMeta) {
-            setLure(inviteLinkMeta as DeepLinkData);
+          const appInvite = await getInviteLinkMeta({
+            inviteLink: extractedLink,
+            branchDomain: BRANCH_DOMAIN,
+            branchKey: BRANCH_KEY,
+          });
+          if (appInvite) {
+            setLure(appInvite);
             return;
           } else {
             throw new Error('Failed to retrieve invite metadata');

diff --git a/apps/tlon-mobile/src/screens/Onboarding/SetTelemetryScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/SetTelemetryScreen.tsx
@@ -1,5 +1,5 @@
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
-import { useSignupContext } from '.././../lib/signupContext';
+import { trackOnboardingAction } from '@tloncorp/app/utils/posthog';
 import {
   ScreenHeader,
   SizableText,
@@ -8,12 +8,11 @@ import {
   XStack,
   YStack,
 } from '@tloncorp/ui';
-import { usePostHog } from 'posthog-react-native';
 import { useCallback, useState } from 'react';
 import { Switch } from 'react-native';
-import branch from 'react-native-branch';
 
 import type { OnboardingStackParamList } from '../../types';
+import { useSignupContext } from '.././../lib/signupContext';
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, 'SetTelemetry'>;
 
@@ -24,21 +23,19 @@ export const SetTelemetryScreen = ({
   },
 }: Props) => {
   const [isEnabled, setIsEnabled] = useState(true);
-  const postHog = usePostHog();
   const signupContext = useSignupContext();
 
   const handleNext = useCallback(() => {
     signupContext.setOnboardingValues({ telemetry: isEnabled });
-
-    if (!isEnabled) {
-      postHog?.optOut();
-      branch.disableTracking(true);
-    }
+    trackOnboardingAction({
+      actionName: 'SetTelemetry',
+      telemetryEnabled: isEnabled,
+    });
 
     navigation.push('ReserveShip', {
       user,
     });
-  }, [isEnabled, user, postHog, navigation, signupContext]);
+  }, [isEnabled, user, navigation, signupContext]);
 
   return (
     <View flex={1} backgroundColor="$secondaryBackground">

diff --git a/apps/tlon-mobile/src/screens/Onboarding/SignupScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/SignupScreen.tsx
@@ -10,7 +10,7 @@ import {
 } from '@tloncorp/app/contexts/branch';
 import { HostingError } from '@tloncorp/app/lib/hostingApi';
 import { trackOnboardingAction } from '@tloncorp/app/utils/posthog';
-import { createDevLogger } from '@tloncorp/shared';
+import { AnalyticsEvent, createDevLogger } from '@tloncorp/shared';
 import {
   Field,
   KeyboardAvoidingView,
@@ -81,7 +81,7 @@ export const SignupScreen = ({ navigation }: Props) => {
       actionName: 'Phone or Email Submitted',
       phoneNumber: phoneForm.getValues().phoneNumber,
       email: emailForm.getValues().email,
-      lure: signupParams.lureId,
+      lure: lureMeta?.id,
     });
 
     signupContext.setOnboardingValues({
@@ -93,14 +93,7 @@ export const SignupScreen = ({ navigation }: Props) => {
       mode: 'signup',
       otpMethod,
     });
-  }, [
-    phoneForm,
-    emailForm,
-    signupParams.lureId,
-    signupContext,
-    navigation,
-    otpMethod,
-  ]);
+  }, [phoneForm, emailForm, lureMeta, signupContext, navigation, otpMethod]);
 
   const toggleSignupMode = useCallback(() => {
     setRemoteError(undefined);
@@ -113,10 +106,10 @@ export const SignupScreen = ({ navigation }: Props) => {
     setIsSubmitting(true);
     try {
       const { enabled } = await hostingApi.getHostingAvailability({
-        lure: signupParams.lureId,
         priorityToken: signupParams.priorityToken,
       });
       if (!enabled) {
+        logger.trackError(AnalyticsEvent.InvitedUserFailedInventoryCheck);
         navigation.navigate('JoinWaitList', {});
         return;
       }
@@ -167,7 +160,6 @@ export const SignupScreen = ({ navigation }: Props) => {
     setIsSubmitting(false);
   }, [
     hostingApi,
-    signupParams.lureId,
     signupParams.priorityToken,
     recaptcha,
     otpMethod,
@@ -276,8 +268,8 @@ export const SignupScreen = ({ navigation }: Props) => {
           </YStack>
           <View marginLeft="$l" marginTop="$m">
             <TlonText.Text
-              size="$label/m"
-              color="$secondaryText"
+              size="$label/s"
+              color="$tertiaryText"
               onPress={toggleSignupMode}
               textAlign="center"
             >

diff --git a/apps/tlon-mobile/src/screens/Onboarding/TlonLogin.tsx b/apps/tlon-mobile/src/screens/Onboarding/TlonLogin.tsx
@@ -192,7 +192,6 @@ export const TlonLoginScreen = ({ navigation, route }: Props) => {
               loading={isSubmitting}
               disabled={
                 isSubmitting ||
-                remoteError !== undefined ||
                 (otpMethod === 'phone'
                   ? !phoneForm.formState.isValid
                   : !emailForm.formState.isValid)
@@ -256,6 +255,7 @@ export const TlonLoginScreen = ({ navigation, route }: Props) => {
               </>
             ) : (
               <TlonText.Text
+                size="$label/s"
                 color="$secondaryText"
                 textAlign="center"
                 onPress={handlePressEmailSignup}

diff --git a/apps/tlon-mobile/src/screens/Onboarding/TlonLoginLegacy.tsx b/apps/tlon-mobile/src/screens/Onboarding/TlonLoginLegacy.tsx
@@ -165,7 +165,7 @@ export const TlonLoginLegacy = ({ navigation }: Props) => {
   });
 
   return (
-    <View flex={1}>
+    <View flex={1} backgroundColor="$secondaryBackground">
       <ScreenHeader
         title="Tlon Login"
         showSessionStatus={false}
@@ -251,30 +251,34 @@ export const TlonLoginLegacy = ({ navigation }: Props) => {
               )}
               name="password"
             />
+            <View paddingBottom="$m">
+              <TlonText.Text
+                size="$label/s"
+                color="$tertiaryText"
+                textAlign="center"
+              >
+                By logging in you agree to Tlon&rsquo;s{' '}
+                <TlonText.RawText
+                  pressStyle={{
+                    opacity: 0.5,
+                  }}
+                  textDecorationLine="underline"
+                  textDecorationDistance={10}
+                  onPress={handlePressEula}
+                >
+                  Terms of Service
+                </TlonText.RawText>
+              </TlonText.Text>
+            </View>
             <TlonText.Text
               size="$label/m"
-              color="$primaryText"
+              color="$secondaryText"
               textAlign="center"
               onPress={handleForgotPassword}
             >
               Forgot password?
             </TlonText.Text>
           </YStack>
-          <View padding="$xl">
-            <TlonText.Text size="$label/s" color="$tertiaryText">
-              By logging in you agree to Tlon&rsquo;s{' '}
-              <TlonText.RawText
-                pressStyle={{
-                  opacity: 0.5,
-                }}
-                textDecorationLine="underline"
-                textDecorationDistance={10}
-                onPress={handlePressEula}
-              >
-                Terms of Service
-              </TlonText.RawText>
-            </TlonText.Text>
-          </View>
         </YStack>
       </KeyboardAvoidingView>
     </View>

diff --git a/desk/app/activity.hoon b/desk/app/activity.hoon
@@ -1180,8 +1180,7 @@
   =.  importing  &
   =.  indices   (~(put by indices) [%base ~] *index:a)
   =.  cor  set-chat-reads
-  ::REVIEW  maybe need a scry api version bump here?
-  =+  .^(=channels:c %gx (scry-path %channels /v2/channels/full/noun))
+  =+  .^(=channels:c %gx (scry-path %channels /v3/channels/full/noun))
   =.  cor  (set-volumes channels)
   =.  cor  (set-channel-reads channels)
   =.  cor  refresh-all-summaries

diff --git a/desk/app/channels.hoon b/desk/app/channels.hoon
@@ -734,6 +734,9 @@
     ::
         [%x %v2 %channels full=?(~ [%full ~])]
       ``channels-2+!>((uv-channels-2:utils v-channels ?=(^ full.pole)))
+    ::
+        [%x %v3 %channels full=?(~ [%full ~])]
+      ``channels-3+!>((uv-channels-3:utils v-channels ?=(^ full.pole)))
     ::
       [%x ?(%v0 %v1) %init ~]    ``noun+!>([unreads (uv-channels-1:utils v-channels)])
       [%x %v2 %init ~]  ``noun+!>([unreads (uv-channels-2:utils v-channels |)])