Merge branch 'develop' into po/tlon-3304-preserve-navigation-state-wh…

…en-resizing-window
tloncorp · Dec 6, 2024 · e24eaea · e24eaea
2 parents eac8164 + f2d770e
commit e24eaea
Show file tree

Hide file tree

Showing 35 changed files with 275 additions and 116 deletions.
diff --git a/.github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary.yml
@@ -69,6 +69,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ env.tag }}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
       - uses: actions/download-artifact@v3
         with:
           name: "ui-dist"

diff --git a/.github/workflows/sync-dev.yml b/.github/workflows/sync-dev.yml
@@ -10,11 +10,13 @@ jobs:
     name: "Syncs the latest staging deploy from staging to develop"
     steps:
       - uses: actions/checkout@v3
+        with:
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
       - name: Set Git config
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Github Actions"
-      - name: Merge Dev to Master
+      - name: Merge Staging to Develop
         run: |
           git fetch --unshallow
           git checkout staging

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -10,6 +10,8 @@ jobs:
     name: "Syncs the latest livenet deploy from develop to master"
     steps:
       - uses: actions/checkout@v3
+        with:
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
       - name: Set Git config
         run: |
           git config --local user.email "[email protected]"
@@ -22,4 +24,4 @@ jobs:
           git checkout master
           git pull
           git merge --no-ff staging
-          git push
+          git push
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.2.4"
+        versionName "5.0.0"
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
     }

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.2.4;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1465,7 +1465,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.2.4;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1689,7 +1689,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.2.4;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1732,7 +1732,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.2.4;
+				MARKETING_VERSION = 5.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/apps/tlon-mobile/src/components/AuthenticatedApp.tsx b/apps/tlon-mobile/src/components/AuthenticatedApp.tsx
@@ -2,6 +2,7 @@ import { useShip } from '@tloncorp/app/contexts/ship';
 import { useAppStatusChange } from '@tloncorp/app/hooks/useAppStatusChange';
 import { useConfigureUrbitClient } from '@tloncorp/app/hooks/useConfigureUrbitClient';
 import { useCurrentUserId } from '@tloncorp/app/hooks/useCurrentUser';
+import { useFindSuggestedContacts } from '@tloncorp/app/hooks/useFindSuggestedContacts';
 import { useNavigationLogging } from '@tloncorp/app/hooks/useNavigationLogger';
 import { useNetworkLogger } from '@tloncorp/app/hooks/useNetworkLogger';
 import { useTelemetry } from '@tloncorp/app/hooks/useTelemetry';
@@ -29,6 +30,7 @@ function AuthenticatedApp() {
   useNavigationLogging();
   useNetworkLogger();
   useCheckAppUpdated();
+  useFindSuggestedContacts();
 
   useEffect(() => {
     configureClient();

diff --git a/apps/tlon-mobile/src/screens/Onboarding/ReserveShipScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/ReserveShipScreen.tsx
@@ -1,6 +1,5 @@
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
 import { useLureMetadata } from '@tloncorp/app/contexts/branch';
-import { useSignupContext } from '.././../lib/signupContext';
 import { NodeBootPhase } from '@tloncorp/app/lib/bootHelpers';
 import {
   ArvosDiscussing,
@@ -14,6 +13,7 @@ import {
 } from '@tloncorp/ui';
 import { useEffect, useMemo } from 'react';
 
+import { useSignupContext } from '../../lib/signupContext';
 import type { OnboardingStackParamList } from '../../types';
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, 'ReserveShip'>;
@@ -36,7 +36,7 @@ export const ReserveShipScreen = ({ navigation }: Props) => {
       signupContext.setOnboardingValues({ didCompleteOnboarding: true });
     }
     signupContext.kickOffBootSequence();
-  }, []);
+  }, [signupContext]);
 
   return (
     <View flex={1} backgroundColor="$secondaryBackground">

diff --git a/apps/tlon-mobile/src/screens/Onboarding/SetNicknameScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/SetNicknameScreen.tsx
@@ -16,8 +16,8 @@ import {
 import { useEffect } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
+import { useSignupContext } from '../../lib/signupContext';
 import type { OnboardingStackParamList } from '../../types';
-import { useSignupContext } from '.././../lib/signupContext';
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, 'SetNickname'>;
 

diff --git a/apps/tlon-web-new/src/app.tsx b/apps/tlon-web-new/src/app.tsx
@@ -6,6 +6,7 @@ import {
 } from '@react-navigation/native';
 import { useConfigureUrbitClient } from '@tloncorp/app/hooks/useConfigureUrbitClient';
 import { useCurrentUserId } from '@tloncorp/app/hooks/useCurrentUser';
+import { useFindSuggestedContacts } from '@tloncorp/app/hooks/useFindSuggestedContacts';
 import { useIsDarkMode } from '@tloncorp/app/hooks/useIsDarkMode';
 import { checkDb, useMigrations } from '@tloncorp/app/lib/webDb';
 import { BasePathNavigator } from '@tloncorp/app/navigation/BasePathNavigator';
@@ -135,6 +136,7 @@ const App = React.memo(function AppComponent() {
   const [dbIsLoaded, setDbIsLoaded] = useState(false);
   const [startedSync, setStartedSync] = useState(false);
   const configureClient = useConfigureUrbitClient();
+  useFindSuggestedContacts();
 
   useEffect(() => {
     handleError(() => {

diff --git a/desk/desk.docket-0 b/desk/desk.docket-0
@@ -2,7 +2,7 @@
     info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.'
     color+0xde.dede
     image+'https://bootstrap.urbit.org/tlon.svg?v=1'
-    glob-http+['https://bootstrap.urbit.org/glob-0v4.irfsv.sq9vg.l6b96.rj7vs.74118.glob' 0v4.irfsv.sq9vg.l6b96.rj7vs.74118]
+    glob-http+['https://bootstrap.urbit.org/glob-0v2.imu38.n1u9d.o2plp.8juvp.5t2ao.glob' 0v2.imu38.n1u9d.o2plp.8juvp.5t2ao]
     base+'groups'
     version+[6 5 0]
     website+'https://tlon.io'

diff --git a/packages/app/features/top/ChannelScreen.tsx b/packages/app/features/top/ChannelScreen.tsx
@@ -71,14 +71,22 @@ export default function ChannelScreen(props: Props) {
         store.syncChannelThreadUnreads(channel.id, {
           priority: store.SyncPriority.High,
         });
+        if (group) {
+          // Update the last visited channel in the group so we can return to it
+          // when we come back to the group
+          db.updateGroup({
+            id: group.id,
+            lastVisitedChannelId: channel.id,
+          });
+        }
       }
       // Mark the channel as visited when we unfocus/leave this screen
       () => {
         if (channel) {
           store.markChannelVisited(channel);
         }
       };
-    }, [channel])
+    }, [channel, group])
   );
 
   const [channelNavOpen, setChannelNavOpen] = React.useState(false);

diff --git a/packages/app/features/top/ChatListScreen.tsx b/packages/app/features/top/ChatListScreen.tsx
@@ -15,6 +15,7 @@ import {
   GroupPreviewSheet,
   InviteUsersSheet,
   NavBarView,
+  NavigationProvider,
   RequestsProvider,
   ScreenHeader,
   View,
@@ -45,8 +46,10 @@ export default function ChatListScreen(props: Props) {
 
 export function ChatListScreenView({
   previewGroupId,
+  focusedChannelId,
 }: {
   previewGroupId?: string;
+  focusedChannelId?: string;
 }) {
   const navigation = useNavigation<NavigationProp<RootStackParamList>>();
   const [addGroupOpen, setAddGroupOpen] = useState(false);
@@ -267,55 +270,57 @@ export function ChatListScreenView({
           setInviteSheetGroup(group);
         }}
       >
-        <View flex={1}>
-          <ScreenHeader
-            title={notReadyMessage ?? screenTitle}
-            rightControls={
-              <>
-                <ScreenHeader.IconButton
-                  type="Search"
-                  onPress={handleSearchInputToggled}
-                />
-                <ScreenHeader.IconButton
-                  type="Add"
-                  onPress={() => setAddGroupOpen(true)}
-                />
-              </>
-            }
-          />
-          {chats && chats.unpinned.length ? (
-            <ChatList
-              activeTab={activeTab}
-              setActiveTab={setActiveTab}
-              pinned={resolvedChats.pinned}
-              unpinned={resolvedChats.unpinned}
-              pending={resolvedChats.pending}
-              onPressItem={onPressChat}
-              onSectionChange={handleSectionChange}
-              showSearchInput={showSearchInput}
-              onSearchToggle={handleSearchInputToggled}
-              searchQuery={searchQuery}
-              onSearchQueryChange={setSearchQuery}
+        <NavigationProvider focusedChannelId={focusedChannelId}>
+          <View flex={1}>
+            <ScreenHeader
+              title={notReadyMessage ?? screenTitle}
+              rightControls={
+                <>
+                  <ScreenHeader.IconButton
+                    type="Search"
+                    onPress={handleSearchInputToggled}
+                  />
+                  <ScreenHeader.IconButton
+                    type="Add"
+                    onPress={() => setAddGroupOpen(true)}
+                  />
+                </>
+              }
             />
-          ) : null}
-
-          <WelcomeSheet
-            open={splashVisible}
-            onOpenChange={handleWelcomeOpenChange}
-          />
-          <GroupPreviewSheet
-            open={!!selectedGroup}
-            onOpenChange={handleGroupPreviewSheetOpenChange}
-            group={selectedGroup ?? undefined}
-            onActionComplete={handleGroupAction}
-          />
-          <InviteUsersSheet
-            open={inviteSheetGroup !== null}
-            onOpenChange={handleInviteSheetOpenChange}
-            onInviteComplete={() => setInviteSheetGroup(null)}
-            group={inviteSheetGroup ?? undefined}
-          />
-        </View>
+            {chats && chats.unpinned.length ? (
+              <ChatList
+                activeTab={activeTab}
+                setActiveTab={setActiveTab}
+                pinned={resolvedChats.pinned}
+                unpinned={resolvedChats.unpinned}
+                pending={resolvedChats.pending}
+                onPressItem={onPressChat}
+                onSectionChange={handleSectionChange}
+                showSearchInput={showSearchInput}
+                onSearchToggle={handleSearchInputToggled}
+                searchQuery={searchQuery}
+                onSearchQueryChange={setSearchQuery}
+              />
+            ) : null}
+
+            <WelcomeSheet
+              open={splashVisible}
+              onOpenChange={handleWelcomeOpenChange}
+            />
+            <GroupPreviewSheet
+              open={!!selectedGroup}
+              onOpenChange={handleGroupPreviewSheetOpenChange}
+              group={selectedGroup ?? undefined}
+              onActionComplete={handleGroupAction}
+            />
+            <InviteUsersSheet
+              open={inviteSheetGroup !== null}
+              onOpenChange={handleInviteSheetOpenChange}
+              onInviteComplete={() => setInviteSheetGroup(null)}
+              group={inviteSheetGroup ?? undefined}
+            />
+          </View>
+        </NavigationProvider>
         <NavBarView
           navigateToContacts={() => {
             navigation.navigate('Contacts');

diff --git a/packages/app/features/top/GroupChannelsScreen.tsx b/packages/app/features/top/GroupChannelsScreen.tsx
@@ -10,6 +10,7 @@ import {
   ChatOptionsProvider,
   GroupChannelsScreenView,
   InviteUsersSheet,
+  NavigationProvider,
 } from '@tloncorp/ui';
 import { useCallback, useState } from 'react';
 
@@ -26,8 +27,10 @@ export function GroupChannelsScreen({ route }: Props) {
 
 export function GroupChannelsScreenContent({
   groupId: id,
+  focusedChannelId,
 }: {
   groupId: string;
+  focusedChannelId?: string;
 }) {
   const navigation = useNavigation<NavigationProp<RootStackParamList>>();
   const isFocused = useIsFocused();
@@ -76,14 +79,16 @@ export function GroupChannelsScreenContent({
       }}
       {...useChatSettingsNavigation()}
     >
-      <GroupChannelsScreenView
-        onChannelPressed={handleChannelSelected}
-        onBackPressed={handleGoBackPressed}
-        onJoinChannel={handleJoinChannel}
-        group={group}
-        unjoinedChannels={unjoinedChannels}
-        enableCustomChannels={enableCustomChannels}
-      />
+      <NavigationProvider focusedChannelId={focusedChannelId}>
+        <GroupChannelsScreenView
+          onChannelPressed={handleChannelSelected}
+          onBackPressed={handleGoBackPressed}
+          onJoinChannel={handleJoinChannel}
+          group={group}
+          unjoinedChannels={unjoinedChannels}
+          enableCustomChannels={enableCustomChannels}
+        />
+      </NavigationProvider>
       <InviteUsersSheet
         open={inviteSheetGroup !== null}
         onOpenChange={(open) => {

diff --git a/packages/app/hooks/useFindSuggestedContacts.ts b/packages/app/hooks/useFindSuggestedContacts.ts
@@ -0,0 +1,10 @@
+import * as store from '@tloncorp/shared/store';
+import { useEffect } from 'react';
+
+export function useFindSuggestedContacts() {
+  const { data: joinedGroupCount } = store.useJoinedGroupsCount();
+
+  useEffect(() => {
+    store.findContactSuggestions();
+  }, [joinedGroupCount]);
+}
diff --git a/packages/app/navigation/desktop/HomeNavigator.tsx b/packages/app/navigation/desktop/HomeNavigator.tsx
@@ -56,7 +56,19 @@ function DrawerContent(props: DrawerContentComponentProps) {
     'groupId' in focusedRoute.params &&
     focusedRoute.params.groupId
   ) {
+    if ('channelId' in focusedRoute.params) {
+      return (
+        <GroupChannelsScreenContent
+          groupId={focusedRoute.params.groupId}
+          focusedChannelId={focusedRoute.params.channelId}
+        />
+      );
+    }
     return <GroupChannelsScreenContent groupId={focusedRoute.params.groupId} />;
+  } else if (focusedRoute.params && 'channelId' in focusedRoute.params) {
+    return (
+      <ChatListScreenView focusedChannelId={focusedRoute.params.channelId} />
+    );
   } else {
     return <ChatListScreenView />;
   }