@amityco/react-native-social-uikit 4.0.0-dc7783d.0 → 4.0.0-e6c5bc7b.0

package/src/providers/amity-ui-kit-provider.tsx

@@ -17,6 +17,8 @@ import { AdEngineProvider } from '../v4/providers/AdEngineProvider';
 import BottomSheetComponent from '../v4/component/BottomSheetComponent/BottomSheetComponent';
 import Toast from '../v4/component/Toast';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { ErrorBoundary } from '../components/ErrorBoundary';
 
 export type CusTomTheme = typeof DefaultTheme;
 export interface IAmityUIkitProvider {
@@ -143,32 +145,36 @@ export default function AmityUiKitProvider({
   };
 
   return (
-    <QueryClientProvider client={queryClient}>
-      <Provider store={store} context={AmityUIKitReduxContext}>
-        <AuthContextProvider
-          userId={userId}
-          displayName={displayName || userId}
-          apiKey={apiKey}
-          apiRegion={apiRegion}
-          apiEndpoint={apiEndpoint}
-          authToken={authToken}
-          fcmToken={fcmToken}
-        >
-          <AdEngineProvider>
-            <ConfigProvider configs={configData}>
-              <BehaviourProvider behaviour={behaviour}>
-                <ExploreProvider>
-                  <PaperProvider theme={globalTheme}>
-                    {children}
-                    <BottomSheetComponent />
-                    <Toast />
-                  </PaperProvider>
-                </ExploreProvider>
-              </BehaviourProvider>
-            </ConfigProvider>
-          </AdEngineProvider>
-        </AuthContextProvider>
-      </Provider>
-    </QueryClientProvider>
+    <ErrorBoundary>
+      <SafeAreaProvider>
+        <QueryClientProvider client={queryClient}>
+          <Provider store={store} context={AmityUIKitReduxContext}>
+            <AuthContextProvider
+              userId={userId}
+              displayName={displayName || userId}
+              apiKey={apiKey}
+              apiRegion={apiRegion}
+              apiEndpoint={apiEndpoint}
+              authToken={authToken}
+              fcmToken={fcmToken}
+            >
+              <AdEngineProvider>
+                <ConfigProvider configs={configData}>
+                  <BehaviourProvider behaviour={behaviour}>
+                    <ExploreProvider>
+                      <PaperProvider theme={globalTheme}>
+                        {children}
+                        <BottomSheetComponent />
+                        <Toast />
+                      </PaperProvider>
+                    </ExploreProvider>
+                  </BehaviourProvider>
+                </ConfigProvider>
+              </AdEngineProvider>
+            </AuthContextProvider>
+          </Provider>
+        </QueryClientProvider>
+      </SafeAreaProvider>
+    </ErrorBoundary>
   );
 }

package/src/providers/auth-provider.tsx

@@ -4,8 +4,7 @@ import { Client } from '@amityco/ts-sdk-react-native';
 import type { AuthContextInterface } from '../types/auth.interface';
 import { Alert, Platform } from 'react-native';
 import type { IAmityUIkitProvider } from './amity-ui-kit-provider';
-// @ts-ignore
-// import { setupAmityVideoPlayer } from '@amityco/video-player-react-native';
+import { ERROR_CODE } from '../v4/constants';
 
 export const AuthContext = React.createContext<AuthContextInterface>({
   client: null,
@@ -18,6 +17,7 @@ export const AuthContext = React.createContext<AuthContextInterface>({
   apiRegion: 'sg',
   authToken: '',
   fcmToken: undefined,
+  isGlobalBan: false,
 });
 
 export const AuthContextProvider: FC<IAmityUIkitProvider> = ({
@@ -37,6 +37,7 @@ export const AuthContextProvider: FC<IAmityUIkitProvider> = ({
   const client: Amity.Client = Client.createClient(apiKey, apiRegion, {
     apiEndpoint: { http: apiEndpoint },
   });
+  const [isGlobalBan, setIsGlobalBan] = useState(false);
 
   const sessionHandler: Amity.SessionHandler = {
     sessionWillRenewAccessToken(renewal) {
@@ -45,8 +46,11 @@ export const AuthContextProvider: FC<IAmityUIkitProvider> = ({
   };
 
   useEffect(() => {
-    return Client.onSessionStateChange((state: Amity.SessionStates) =>
-      setSessionState(state)
+    return Client.onSessionStateChange(
+      (state: Amity.SessionStates, reason: Amity.TokenTerminationReason) => {
+        setSessionState(state);
+        setIsGlobalBan(reason === 'globalBan');
+      }
     );
   }, []);
 
@@ -77,8 +81,14 @@ export const AuthContextProvider: FC<IAmityUIkitProvider> = ({
     if (authToken?.length > 0) {
       loginParam = { ...loginParam, authToken: authToken };
     }
-    const response = await Client.login(loginParam, sessionHandler);
-    if (!response) return;
+    try {
+      const response = await Client.login(loginParam, sessionHandler);
+      if (!response) return;
+    } catch (err) {
+      if (err?.message?.includes(ERROR_CODE.GLOBAL_BAN)) {
+        setIsGlobalBan(true);
+      }
+    }
 
     // setupAmityVideoPlayer();
 
@@ -149,11 +159,11 @@ export const AuthContextProvider: FC<IAmityUIkitProvider> = ({
         isConnected,
         sessionState,
         apiRegion: apiRegion.toLowerCase(),
+        isGlobalBan,
       }}
     >
       {children}
     </AuthContext.Provider>
-    //
   );
 };
 export default AuthContextProvider;

package/src/providers/file-provider.tsx

@@ -38,29 +38,51 @@ export async function uploadImageFile(
   perCentCallback?: (percent: number) => void
 ): Promise<Amity.File<'image'>[]> {
   return await new Promise(async (resolve, reject) => {
-    const formData = new FormData();
-    const parts = filePath.split('/');
-    const fileName = parts[parts.length - 1];
-    const fileType = Platform.OS === 'ios' ? 'image/jpeg' : 'image/jpg';
-    const uri =
-      Platform.OS === 'android' ? filePath : filePath.replace('file://', '');
+    try {
+      const formData = new FormData();
+      const parts = filePath.split('/');
+      const fileName = parts[parts.length - 1];
+      const fileType = Platform.OS === 'ios' ? 'image/jpeg' : 'image/jpg';
+      const uri =
+        Platform.OS === 'android' ? filePath : filePath.replace('file://', '');
 
-    formData.append('files', {
-      name: fileName,
-      type: fileType,
-      uri: uri,
-    });
+      formData.append('files', {
+        name: fileName,
+        type: fileType,
+        uri: uri,
+      });
 
-    const { data: file } = await FileRepository.uploadImage(
-      formData,
-      (percent) => {
-        perCentCallback && perCentCallback(percent);
+      const { data: file } = await FileRepository.uploadImage(
+        formData,
+        (percent) => {
+          perCentCallback && perCentCallback(percent);
+        }
+      );
+
+      if (file) {
+        resolve(file);
+      } else {
+        reject({ message: 'Upload failed - no file data returned' });
+      }
+    } catch (error: any) {
+      if (
+        error?.message?.includes('INVALID_IMAGE') ||
+        error?.message?.includes('Inappropriate')
+      ) {
+        reject({
+          message: 'Inappropriate image',
+          details: 'Please choose a different image to upload.',
+          code: 'INVALID_IMAGE',
+        });
+      } else {
+        reject({
+          message: 'Upload failed',
+          details:
+            error?.message ||
+            "We couldn't complete your upload. Please try again.",
+          originalError: error,
+        });
       }
-    );
-    if (file) {
-      resolve(file);
-    } else {
-      reject('Upload error');
     }
   });
 }

package/src/screens/CategorytList/index.tsx

@@ -1,12 +1,6 @@
 import { CategoryRepository } from '@amityco/ts-sdk-react-native';
 import React, { useEffect, useState, useRef } from 'react';
-import {
-  FlatList,
-  View,
-  Text,
-  Image,
-  TouchableOpacity,
-} from 'react-native';
+import { FlatList, View, Text, Image, TouchableOpacity } from 'react-native';
 import { useStyles } from './styles';
 import CloseButton from '../../components/BackButton';
 import useAuth from '../../hooks/useAuth';
@@ -14,11 +8,11 @@ import useAuth from '../../hooks/useAuth';
 export default function CategoryList({ navigation }: any) {
   const { apiRegion } = useAuth();
 
-  const [categoryObject, setCategoryObject] = useState<Amity.LiveCollection<Amity.Category>>();
+  const [categoryObject, setCategoryObject] =
+    useState<Amity.LiveCollection<Amity.Category>>();
   const { data: categoryArr = [], onNextPage } = categoryObject ?? {};
   const styles = useStyles();
 
-
   const onEndReachedCalledDuringMomentumRef = useRef(true);
   React.useLayoutEffect(() => {
     navigation.setOptions({
@@ -41,7 +35,7 @@ export default function CategoryList({ navigation }: any) {
         unsubscribe();
       } catch (error) {
         console.error('Failed to load categories:', error);
-      } 
+      }
     };
     loadCategories();
   }, []);
@@ -71,10 +65,9 @@ export default function CategoryList({ navigation }: any) {
     );
   };
 
-
-  const handleEndReached=()=>{
-    onNextPage && onNextPage()
-  }
+  const handleEndReached = () => {
+    onNextPage && onNextPage();
+  };
 
   return (
     <View style={styles.container}>

package/src/screens/CommunitySearch/index.tsx

@@ -15,6 +15,7 @@ import { useNavigation } from '@react-navigation/native';
 import CustomTab from '../../components/CustomTab';
 import {
   CommunityRepository,
+  SearchUsersByEnum,
   UserRepository,
 } from '@amityco/ts-sdk-react-native';
 import type { ISearchItem } from '../../components/SearchItem';
@@ -83,7 +84,11 @@ export default function CommunitySearch() {
   const searchAccounts = (text: string = '') => {
     if (text.length > 2) {
       const unsubscribe = UserRepository.searchUserByDisplayName(
-        { displayName: text, limit: 20 },
+        {
+          displayName: text,
+          limit: 20,
+          searchBy: [SearchUsersByEnum.DISPLAY_NAME],
+        },
         (data) => {
           setUsersObject(data);
         }

package/src/screens/CreateLivestream/CreateLivestream.tsx

@@ -16,7 +16,7 @@ import { useStyles } from './styles';
 import useImagePicker from '../../../src/hooks/useImagePicker';
 import { uploadImageFile } from '../../../src/providers/file-provider';
 
-import { StreamRepository, PostRepository } from '@amityco/ts-sdk-react-native';
+import { PostRepository, RoomRepository } from '@amityco/ts-sdk-react-native';
 import BottomSheet, { BottomSheetMethods } from '@devvie/bottom-sheet';
 
 // import {
@@ -55,7 +55,7 @@ const CreateLivestream = ({ navigation, route }) => {
 
   const [title, setTitle] = useState<string>('');
   const [description, setDescription] = useState<string>('');
-  const [stream, setStream] = useState<Amity.Stream | null>(null);
+  const [room, setRoom] = useState<Amity.Room | null>(null);
   const [isLive, setIsLive] = useState<boolean>(false);
   const [timer] = useState<number | null>(null);
 
@@ -141,16 +141,16 @@ const CreateLivestream = ({ navigation, route }) => {
   }, []);
 
   const createStreamPost = useCallback(
-    (newStream: Amity.Stream) => {
+    (newRoom: Amity.Room) => {
       const params = {
         targetId,
         targetType,
-        dataType: 'liveStream' as Amity.PostContentType,
+        dataType: 'room' as Amity.PostContentType,
         data: {
-          text: `${newStream.title}${
-            newStream.description ? `\n\n${newStream.description}` : ''
+          text: `${newRoom.title}${
+            newRoom.description ? `\n\n${newRoom.description}` : ''
           }`,
-          streamId: newStream.streamId,
+          roomId: newRoom.roomId,
         },
       };
 
@@ -168,18 +168,18 @@ const CreateLivestream = ({ navigation, route }) => {
 
       if (imageUri) fileId = await uploadFile(imageUri);
 
-      const { data: newStream } = await StreamRepository.createStream({
+      const { data: newRoom } = await RoomRepository.createRoom({
         title,
         description: description || undefined,
         thumbnailFileId: fileId,
       });
 
-      if (newStream) {
-        const { data: newPost } = await createStreamPost(newStream);
-        setStream(newStream);
+      if (newRoom) {
+        const { data: newPost } = await createStreamPost(newRoom);
+        setRoom(newRoom);
         setPost(newPost);
 
-        streamRef?.current.startPublish(newStream.streamId);
+        streamRef?.current.startPublish(newRoom.roomId);
       }
     } else emptyTitleAlert();
   }, [title, description, createStreamPost, imageUri, uploadFile]);
@@ -193,17 +193,17 @@ const CreateLivestream = ({ navigation, route }) => {
   // };
 
   const onStopStream = useCallback(async () => {
-    if (stream) {
+    if (room) {
       setIsEnding(true);
       try {
-        await StreamRepository.disposeStream(stream.streamId);
+        await RoomRepository.stopRoom(room.roomId);
       } catch (e) {
-        console.log('disposeStream error', e);
+        console.log('stopRoom error', e);
       }
 
       streamRef?.current.stopPublish();
       setIsLive(false);
-      setStream(null);
+      setRoom(null);
       setTitle(undefined);
       setDescription(undefined);
       setTime(0);
@@ -214,7 +214,7 @@ const CreateLivestream = ({ navigation, route }) => {
         postId: post.postId,
       });
     }
-  }, [stream, timer, post, navigation]);
+  }, [room, timer, post, navigation]);
 
   const onSwitchCamera = () => {
     streamRef?.current.switchCamera();

package/src/screens/LivestreamPlayer/index.tsx

@@ -7,14 +7,11 @@ import {
 } from 'react-native';
 import { useStyles } from './styles';
 
-// @ts-ignore
-// import { AmityStreamPlayer } from '@amityco/video-player-react-native';
-
 import LivestreamEndedView from '../../v4/component/LivestreamContent/LivestreamEndedThumbnail';
 import { Animated } from 'react-native';
 import { SvgXml } from 'react-native-svg';
 import { closeIcon, playIcon, stopIcon } from '../../svg/svg-xml-list';
-import { StreamRepository } from '@amityco/ts-sdk-react-native';
+import { RoomRepository } from '@amityco/ts-sdk-react-native';
 
 const LiveStreamPlayer = ({ navigation, route }) => {
   const ref = useRef<any>(null);
@@ -24,9 +21,9 @@ const LiveStreamPlayer = ({ navigation, route }) => {
 
   const [isPlaying, setIsPlaying] = useState(true);
 
-  const { streamId } = route.params;
+  const { roomId } = route.params;
 
-  const [livestream, setLivestream] = useState<Amity.Stream>();
+  const [livestream, setLivestream] = useState<Amity.Room>();
 
   const onClosePlayer = () => {
     navigation.goBack();
@@ -59,15 +56,12 @@ const LiveStreamPlayer = ({ navigation, route }) => {
 
   useEffect(() => {
     const getLivestream = () => {
-      return StreamRepository.getStreamById(
-        streamId,
-        ({ data, loading, error }) => {
-          if (error) console.error('Error fetching livestream', error);
-          if (!loading && data) {
-            setLivestream({ ...data });
-          }
+      return RoomRepository.getRoom(roomId, ({ data, loading, error }) => {
+        if (error) console.error('Error fetching livestream', error);
+        if (!loading && data) {
+          setLivestream({ ...data });
         }
-      );
+      });
     };
 
     const unsubscribe = getLivestream();
@@ -75,7 +69,7 @@ const LiveStreamPlayer = ({ navigation, route }) => {
     return () => {
       unsubscribe();
     };
-  }, [streamId]);
+  }, [roomId]);
 
   return (
     <View style={styles.container}>

package/src/snippet/AmityCommunitySearchResultComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityCommunitySearchResultComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 import { TabName } from '../v4/enum';

package/src/snippet/AmityCreatePostMenuComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityCreatePostMenuComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityDetailedMediaAttachmentComponent.tsx

@@ -8,7 +8,7 @@ import {
   AmityDetailedMediaAttachmentComponent,
   AmityUiKitProvider,
   mediaAttachment,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityEmptyNewsFeedComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityEmptyNewsFeedComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityGlobalFeedComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityGlobalFeedComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityMediaAttachmentComponent.tsx

@@ -8,7 +8,7 @@ import {
   AmityMediaAttachmentComponent,
   AmityUiKitProvider,
   mediaAttachment,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityMyCommunitiesComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityMyCommunitiesComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityMyCommunitiesSearchPage.tsx

@@ -7,7 +7,7 @@
 import {
   AmityMyCommunitiesSearchPage,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityNewsFeedComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityNewsFeedComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityPostComposerPage.tsx

@@ -8,7 +8,7 @@ import {
   AmityPostComposerPage,
   AmityUiKitProvider,
   AmityPostComposerMode,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityPostContentComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityPostContentComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityPostDetailPage.tsx

@@ -7,7 +7,7 @@
 import {
   AmityPostDetailPage,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityPostTargetSelectionPage.tsx

@@ -8,7 +8,7 @@ import {
   AmityPostTargetSelectionPage,
   AmityUiKitProvider,
   AmityPostTargetSelectionPageType,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityReactionListComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityReactionListComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmitySocialGlobalSearchPage.tsx

@@ -7,7 +7,7 @@
 import {
   AmitySocialGlobalSearchPage,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmitySocialHomePage.tsx

@@ -7,7 +7,7 @@
 import {
   AmitySocialHomePage,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmitySocialHomeTopNavigationComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmitySocialHomeTopNavigationComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityStoryTargetSelectionPage.tsx

@@ -7,7 +7,7 @@
 import {
   AmityStoryTargetSelectionPage,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider

package/src/snippet/AmityTopSearchBarComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityTopSearchBarComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 import { TabName } from '../v4/enum';

package/src/snippet/AmityUserSearchResultComponent.tsx

@@ -7,7 +7,7 @@
 import {
   AmityUserSearchResultComponent,
   AmityUiKitProvider,
-} from 'amity-react-native-social-ui-kit';
+} from '@amityco/react-native-social-uikit';
 import React from 'react';
 import config from '../../uikit.config.json';
 <AmityUiKitProvider