Transfer history updates (#321)

* Bump js-lib; * Added compatibility for new transfer history while keeping current state support; * Fix tests; * Extended DotYouClientProvider; * Version bump; * Reload the community webview when the URI changes; * Another version bump; * Another version bump; And matching type fixes; * Fix tests; --------- Co-authored-by: Bishwajeet Parhi <[email protected]>
homebase-id · Jan 30, 2025 · 935c875 · 935c875
1 parent 753c54d
commit 935c875
Show file tree

Hide file tree

Showing 38 changed files with 502 additions and 338 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "lint": "npm run lint -workspaces --if-present"
   },
   "dependencies": {
-    "@homebase-id/js-lib": "0.0.6-alpha.23",
+    "@homebase-id/js-lib": "0.0.7-alpha.36",
     "axios": "1.7.5",
     "patch-package": "8.0.0",
     "react": "18.3.1",

diff --git a/packages/common/src/hooks/auth/useDotYouClientContext.ts b/packages/common/src/hooks/auth/useDotYouClientContext.ts
@@ -1,9 +1,7 @@
-import { ApiType, DotYouClient } from '@homebase-id/js-lib/core';
+import { DotYouClient } from '@homebase-id/js-lib/core';
 import { useContext, createContext } from 'react';
 
-export const DotYouClientContext = createContext<DotYouClient | null>(
-  new DotYouClient({ api: ApiType.Guest })
-);
+export const DotYouClientContext = createContext<DotYouClient | null>(null);
 
 export const useDotYouClientContext = () => {
   const dotYouClient = useContext(DotYouClientContext);

diff --git a/packages/common/src/hooks/contacts/useAllConnections.ts b/packages/common/src/hooks/contacts/useAllConnections.ts
@@ -17,7 +17,7 @@ export const useAllConnections = (enabled: boolean) => {
   const fetchConnections = async () => {
     // self invoking function that fetches the contacts in blocks of a CHUNKSIZE untill there are no more contacts to fetch
     const internalGetConnections = async (
-      cursor: number | undefined,
+      cursor: unknown | undefined,
       limit: number
     ): Promise<DotYouProfile[]> => {
       const connections = await getConnections(dotYouClient, { cursor, count: limit });

diff --git a/packages/mobile/__tests__/ChatProvider.test.ts b/packages/mobile/__tests__/ChatProvider.test.ts
@@ -102,7 +102,7 @@ describe('ChatProvider', () => {
   (getRandom16ByteArray as jest.Mock) = mockGetRandom16Bytes;
   beforeEach(() => {
     dotYouClient = new DotYouClient({
-      loggedInIdentity: 'frodobaggins.me',
+      hostIdentity: 'frodobaggins.me',
       api: ApiType.App,
       headers: {},
       sharedSecret: new Uint8Array(32),
@@ -179,7 +179,10 @@ describe('ChatProvider', () => {
     const files = undefined;
     const linkPreviews = undefined;
 
-    (uploadFile as jest.Mock).mockResolvedValue({ file: { fileId: 'file-id' } });
+    (uploadFile as jest.Mock).mockResolvedValue({
+      file: { fileId: 'file-id' },
+      recipientStatus: {},
+    });
 
     const result = await uploadChatMessage(dotYouClient, message, recipients, files, linkPreviews);
 
@@ -216,10 +219,6 @@ describe('ChatProvider', () => {
           content: {
             message: '',
             deliveryStatus: 30,
-            deliveryDetails: {
-              'samwisegamgee.me': 30,
-              'frodobaggins.me': 30,
-            },
           },
           archivalStatus: 2,
         },
@@ -276,10 +275,6 @@ describe('ChatProvider', () => {
           content: {
             message: '',
             deliveryStatus: 30,
-            deliveryDetails: {
-              'samwisegamgee.me': 30,
-              'frodobaggins.me': 30,
-            },
           },
           archivalStatus: 2,
         },
@@ -334,10 +329,6 @@ describe('ChatProvider', () => {
           content: {
             message: '',
             deliveryStatus: 30,
-            deliveryDetails: {
-              'samwisegamgee.me': 30,
-              'frodobaggins.me': 30,
-            },
           },
           archivalStatus: 2,
         },

diff --git a/packages/mobile/__tests__/ConversationProvider.test.ts b/packages/mobile/__tests__/ConversationProvider.test.ts
@@ -82,7 +82,7 @@ jest.mock('react-native-fs', () => {
 
 describe('ConversationProvider', () => {
   const dotYouClientMock = new DotYouClient({
-    loggedInIdentity: 'frodobaggins.me',
+    hostIdentity: 'frodobaggins.me',
     api: ApiType.App,
     headers: {},
     sharedSecret: new Uint8Array(16),

diff --git a/packages/mobile/__tests__/RNPostReactionProvider.test.ts b/packages/mobile/__tests__/RNPostReactionProvider.test.ts
@@ -93,7 +93,7 @@ describe('RNPostReactionProvider', () => {
   let context: ReactionContext;
   let comment: NewHomebaseFile<RawReactionContent> | HomebaseFile<RawReactionContent>;
   const dotYouClient = new DotYouClient({
-    loggedInIdentity: 'frodobaggins.me',
+    hostIdentity: 'frodobaggins.me',
     api: ApiType.App,
     headers: {},
     sharedSecret: new Uint8Array(32),
@@ -217,7 +217,7 @@ describe('RNPostReactionProvider', () => {
   });
 
   it('should handle local comments correctly', async () => {
-    context.odinId = dotYouClient.getLoggedInIdentity();
+    context.odinId = dotYouClient.getLoggedInIdentity() || '';
     const result = await saveComment(dotYouClient, context, comment);
     expect(result).toBeDefined();
   });

diff --git a/packages/mobile/__tests__/RNPostUploadProvider.test.ts b/packages/mobile/__tests__/RNPostUploadProvider.test.ts
@@ -60,7 +60,7 @@ describe('RNPostUploadProvider', () => {
   let onVersionConflict: jest.Mock;
   let onUpdate: jest.Mock;
   const dotYouClient = new DotYouClient({
-    loggedInIdentity: 'frodobaggins.me',
+    hostIdentity: 'frodobaggins.me',
     api: ApiType.App,
     headers: {},
     sharedSecret: new Uint8Array(32),

diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebase-id-app-mobile",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

diff --git a/packages/mobile/src/app/App.tsx b/packages/mobile/src/app/App.tsx
@@ -86,8 +86,10 @@ let App = () => {
       <GestureHandlerRootView>
         <PushNotificationProvider>
           <RouteContextProvider>
-            <RootStack />
-            <Toast />
+            <DotYouClientProvider>
+              <RootStack />
+              <Toast />
+            </DotYouClientProvider>
           </RouteContextProvider>
         </PushNotificationProvider>
       </GestureHandlerRootView>

diff --git a/packages/mobile/src/components/Chat/Chat-Delivery-Indicator.tsx b/packages/mobile/src/components/Chat/Chat-Delivery-Indicator.tsx
@@ -1,4 +1,4 @@
-import { HomebaseFile } from '@homebase-id/js-lib/core';
+import { HomebaseFile, RecipientTransferHistory } from '@homebase-id/js-lib/core';
 import { ChatDeliveryStatus, ChatMessage } from '../../provider/chat/ChatProvider';
 import { t, useDotYouClientContext } from 'homebase-id-app-common';
 import { Pressable, StyleProp, Text, TextStyle, View, ViewStyle } from 'react-native';
@@ -32,17 +32,14 @@ export const ChatDeliveryIndicator = ({
 };
 
 export const FailedDeliveryDetails = ({
-  msg,
-  recipient,
+  transferHistory,
   style,
 }: {
-  msg: HomebaseFile<ChatMessage>;
-  recipient: string;
+  transferHistory: RecipientTransferHistory | undefined;
   style?: StyleProp<TextStyle>;
 }) => {
-  const deliveryDetails = msg.serverMetadata?.transferHistory?.recipients[recipient];
-  if (!deliveryDetails) return null;
-  if (deliveryDetails.latestSuccessfullyDeliveredVersionTag) return null;
+  if (!transferHistory) return null;
+  if (transferHistory.latestSuccessfullyDeliveredVersionTag) return null;
 
   return (
     <Text
@@ -53,7 +50,7 @@ export const FailedDeliveryDetails = ({
         style,
       ]}
     >
-      {t(deliveryDetails.latestTransferStatus)}
+      {t(transferHistory.latestTransferStatus)}
     </Text>
   );
 };

diff --git a/packages/mobile/src/components/Chat/Reactions/Modal/ReportModal.tsx b/packages/mobile/src/components/Chat/Reactions/Modal/ReportModal.tsx
@@ -35,11 +35,14 @@ export const ReportModal = forwardRef(
       );
     };
     const identity = useAuth().getIdentity();
-    const host = new DotYouClient({
-      api: ApiType.Guest,
-      loggedInIdentity: identity || undefined,
-      hostIdentity: identity || undefined,
-    }).getRoot();
+    const host =
+      (identity &&
+        new DotYouClient({
+          api: ApiType.Guest,
+          loggedInIdentity: identity,
+          hostIdentity: identity,
+        }).getRoot()) ||
+      '';
 
     const onBlock = () =>
       openURL(`${host}/owner/connections/${message?.fileMetadata.originalAuthor}/block`);

diff --git a/packages/mobile/src/components/Chat/Reactions/Modal/RetryModal.tsx b/packages/mobile/src/components/Chat/Reactions/Modal/RetryModal.tsx
@@ -12,11 +12,13 @@ import { Container } from '../../../ui/Container/Container';
 import { StyleSheet } from 'react-native';
 import { TouchableHighlight } from 'react-native-gesture-handler';
 import { useChatMessage } from '../../../../hooks/chat/useChatMessage';
-import { HomebaseFile } from '@homebase-id/js-lib/core';
+import { HomebaseFile, RecipientTransferHistory } from '@homebase-id/js-lib/core';
 import { ChatMessage } from '../../../../provider/chat/ChatProvider';
-import { UnifiedConversation } from '../../../../provider/chat/ConversationProvider';
+import { ChatDrive, UnifiedConversation } from '../../../../provider/chat/ConversationProvider';
 import { ErrorNotification } from '../../../ui/Alert/ErrorNotification';
 import { Backdrop } from '../../../ui/Modal/Backdrop';
+import { useTransferHistory } from '../../../../hooks/file/useTransferHistory';
+
 export const RetryModal = forwardRef(
   (
     {
@@ -32,7 +34,26 @@ export const RetryModal = forwardRef(
   ) => {
     const { isDarkMode } = useDarkMode();
     const { mutate, error } = useChatMessage().update;
-    const recipients = message?.serverMetadata?.transferHistory?.recipients;
+    const { data: transferHistory } = useTransferHistory(
+      message && {
+        fileId: message?.fileId,
+        targetDrive: ChatDrive,
+      }
+    ).fetch;
+
+    const recipients =
+      (message?.serverMetadata?.transferHistory &&
+        'recipients' in message.serverMetadata.transferHistory &&
+        (message.serverMetadata.transferHistory as unknown as {
+          [key: string]: RecipientTransferHistory;
+        })) ||
+      transferHistory?.history.results.reduce(
+        (acc, curr) => {
+          acc[curr.recipient] = curr;
+          return acc;
+        },
+        {} as Record<string, RecipientTransferHistory>
+      );
 
     const onRetry = useCallback(() => {
       if (!message) return;
@@ -69,6 +90,7 @@ export const RetryModal = forwardRef(
         return recipients[failedRecipient[0]].latestTransferStatus;
       }
     }, [failedRecipient, recipients]);
+
     return (
       <BottomSheetModal
         ref={ref}

diff --git a/packages/mobile/src/components/Dashboard/NotificationsOverview.tsx b/packages/mobile/src/components/Dashboard/NotificationsOverview.tsx
@@ -101,6 +101,8 @@ const NotificationGroup = ({
   const chatNavigator = useNavigation<NavigationProp<ChatStackParamList>>();
   const tabNavigator = useNavigation<NavigationProp<TabStackParamList>>();
 
+  if (!identity || !chatNavigator || !tabNavigator) return null;
+
   return (
     <View
       style={{

diff --git a/packages/mobile/src/components/Feed/Interacts/PostInteracts.tsx b/packages/mobile/src/components/Feed/Interacts/PostInteracts.tsx
@@ -49,7 +49,7 @@ export const PostInteracts = memo(
   }) => {
     const postContent = postFile.fileMetadata.appData.content;
     const owner = useDotYouClientContext().getLoggedInIdentity();
-    const odinId = postFile.fileMetadata.senderOdinId || owner;
+    const odinId = postFile.fileMetadata.senderOdinId ?? owner;
     const postDisabledEmoji =
       postContent.reactAccess !== undefined &&
       (postContent.reactAccess === false || postContent.reactAccess === 'comment');
@@ -97,9 +97,11 @@ export const PostInteracts = memo(
 
     const permalink = useMemo(
       () =>
-        `${new DotYouClient({ hostIdentity: odinId || undefined, api: ApiType.Guest }).getRoot()}/posts/${postContent.channelId}/${
-          postContent.slug ?? postContent.id
-        }`,
+        odinId
+          ? `${new DotYouClient({ hostIdentity: odinId, api: ApiType.Guest }).getRoot()}/posts/${postContent.channelId}/${
+              postContent.slug ?? postContent.id
+            }`
+          : '',
       [odinId, postContent]
     );
 

diff --git a/packages/mobile/src/components/Feed/MainContent/PostDetailMainContent.tsx b/packages/mobile/src/components/Feed/MainContent/PostDetailMainContent.tsx
@@ -45,7 +45,7 @@ export const PostDetailMainContent = ({
     | undefined
   >();
   const owner = useDotYouClientContext().getLoggedInIdentity();
-  const authorOdinId = postFile.fileMetadata.senderOdinId || owner;
+  const authorOdinId = postFile.fileMetadata.senderOdinId ?? owner;
   const postContent = postFile.fileMetadata.appData.content;
 
   const { data: canReact } = useCanReact({

diff --git a/packages/mobile/src/components/Feed/Meta/Actions.tsx b/packages/mobile/src/components/Feed/Meta/Actions.tsx
@@ -42,10 +42,12 @@ export const ExternalActions = memo(
       getReportContentUrl,
     } = useManageSocialFeed({ odinId });
 
-    const host = new DotYouClient({
-      api: ApiType.Guest,
-      loggedInIdentity: identity || undefined,
-    }).getRoot();
+    const host = identity
+      ? new DotYouClient({
+          api: ApiType.Guest,
+          hostIdentity: identity,
+        }).getRoot()
+      : '';
     const options: ActionGroupProps[] = [
       {
         icon: <Users />,

diff --git a/packages/mobile/src/components/ui/Alert/NotificationToaster.tsx b/packages/mobile/src/components/ui/Alert/NotificationToaster.tsx
@@ -16,7 +16,7 @@ import { getAppName } from '../../../utils/utils';
 export const NotificationToaster = () => {
   const { route } = useRouteContext();
   const dotYouClient = useDotYouClientContext();
-  const identity = useDotYouClientContext().getLoggedInIdentity();
+  const identity = useDotYouClientContext().getLoggedInIdentity() || '';
   const chatNavigator = useNavigation<NavigationProp<ChatStackParamList>>();
   const tabNavigator = useNavigation<NavigationProp<TabStackParamList>>();
   const isConversationScreen = route?.name === 'Conversation' && !route.params;

diff --git a/packages/mobile/src/components/ui/DoubleTapHeart.tsx b/packages/mobile/src/components/ui/DoubleTapHeart.tsx
@@ -33,7 +33,7 @@ export const DoubleTapHeart = memo(
     const postContent = postFile.fileMetadata.appData.content;
     const reactionContext: ReactionContext = useMemo(() => {
       return {
-        odinId: odinId || identity,
+        odinId: odinId || identity || '',
         channelId: postContent.channelId,
         target: {
           globalTransitId: postFile.fileMetadata.globalTransitId ?? 'unknown',