Merge pull request #1629 from GetStream/develop

Next Release

Author: khushal87

.github/workflows/sample-distribution.yml

@@ -30,6 +30,13 @@ jobs:
             yarn && yarn bootstrap-ci;
             cd package/native-package
             yarn;
+      - name: Cache iOS pods
+        uses: actions/cache@v2
+        with:
+          path: examples/SampleApp/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('examples/SampleApp/ios/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
       - name: iOS Pods setup
         uses: nick-invision/retry@v2
         with:

docusaurus/docs/reactnative/basics/troubleshooting.mdx

@@ -236,17 +236,15 @@ You will need to add some modules in your `android/app/build.gradle`
 
 ```java
 dependencies {
-  // For Android versions less than Ice Cream Sandwich (API level 14)
-  implementation 'com.facebook.fresco:animated-base-support:1.3.0'
+  // For animated GIF support
+  implementation 'com.facebook.fresco:animated-gif:2.6.0'
 
-  // For GIF support
-  implementation 'com.facebook.fresco:animated-gif:2.0.0'
+  // For WebP support, including animated WebP
+  implementation 'com.facebook.fresco:animated-webp:2.6.0'
+  implementation 'com.facebook.fresco:webpsupport:2.6.0'
 
-  // For WebP support, with animations
-  implementation 'com.facebook.fresco:animated-webp:2.1.0'
-
-  // For WebP support, without animations
-  implementation 'com.facebook.fresco:webpsupport:2.0.0'
+  // Provide the Android support library (you might already have this or a similar dependency)
+  implementation 'com.android.support:support-core-utils:24.2.1'
   ...
 }
 ```

examples/SampleApp/fastlane/Fastfile

@@ -84,7 +84,14 @@ platform :ios do
 
       package = load_json(json_path: "./package.json")
       increment_version_number(version_number: package["version"], xcodeproj: "./ios/SampleApp.xcodeproj")
-      increment_build_number(xcodeproj: "./ios/SampleApp.xcodeproj")
+      current_build_number = app_store_build_number(
+        live: false,
+        app_identifier: "io.getstream.reactnative.SampleApp",
+      )
+      increment_build_number(
+        build_number: current_build_number + 1,
+        xcodeproj: "./ios/SampleApp.xcodeproj"
+      )
 
       gym(
           workspace: "./ios/SampleApp.xcworkspace",
@@ -112,12 +119,5 @@ platform :ios do
         end
       end
 
-      commit_version_bump(
-        message: "[fastlane][ios] Bump version [skip ci]",
-        xcodeproj: "./ios/SampleApp.xcodeproj",
-        force: true # otherwise untracked files may crash the CI build
-      )
-
-      push_to_git_remote()
   end
 end

examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj

@@ -514,7 +514,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppDebug.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 152;
+				CURRENT_PROJECT_VERSION = 154;
 				DEVELOPMENT_TEAM = EHV7XZLAHA;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SampleApp/Info.plist;
@@ -545,7 +545,7 @@
 				CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppRelease.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 152;
+				CURRENT_PROJECT_VERSION = 154;
 				DEVELOPMENT_TEAM = EHV7XZLAHA;
 				INFOPLIST_FILE = SampleApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

examples/SampleApp/ios/SampleApp/Info.plist

@@ -17,11 +17,11 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.10.2</string>
+		<string>1.11.0</string>
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>152</string>
+		<string>154</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true />
 		<key>NSAppTransportSecurity</key>

examples/SampleApp/ios/SampleAppTests/Info.plist

@@ -15,10 +15,10 @@
 		<key>CFBundlePackageType</key>
 		<string>BNDL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.10.2</string>
+		<string>1.11.0</string>
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>152</string>
+		<string>154</string>
 	</dict>
 </plist>

package/src/components/Attachment/utils/getGiphyMimeType.ts

@@ -0,0 +1,13 @@
+/**
+ *
+ * @param giphyUrl The giphy attachment url
+ * @returns mimeType for the giphy attachment
+ */
+export function getGiphyMimeType(giphyUrl: string): string {
+  if (giphyUrl.includes('.mp4')) {
+    return 'video/mp4';
+  } else if (giphyUrl.includes('.webp')) {
+    return 'image/webp';
+  }
+  return 'image/gif';
+}

package/src/components/ChannelList/__tests__/ChannelList.test.js

@@ -246,6 +246,34 @@ describe('ChannelList', () => {
         });
       });
 
+      it('should add channel to top if channel is hidden from the list', async () => {
+        const { getAllByRole, getByTestId, getByText } = render(
+          <Chat client={chatClient}>
+            <ChannelList {...props} />
+          </Chat>,
+        );
+
+        await waitFor(() => expect(getByTestId('channel-list')).toBeTruthy());
+        act(() => dispatchChannelHiddenEvent(chatClient, testChannel3.channel));
+
+        const newItems = getAllByRole('list-item');
+        await waitFor(() => {
+          expect(newItems).toHaveLength(2);
+        });
+
+        const newMessage = sendNewMessageOnChannel3();
+
+        await waitFor(() => {
+          expect(getByText(newMessage.text)).toBeTruthy();
+        });
+
+        const items = getAllByRole('list-item');
+
+        await waitFor(() => {
+          expect(within(items[0]).getByText(newMessage.text)).toBeTruthy();
+        });
+      });
+
       it('should not alter order if `lockChannelOrder` prop is true', async () => {
         const { getAllByRole, getByTestId, getByText } = render(
           <Chat client={chatClient}>

package/src/components/ChannelList/hooks/listeners/useNewMessage.ts

@@ -24,12 +24,26 @@ export const useNewMessage = <
   useEffect(() => {
     const handleEvent = (event: Event<StreamChatGenerics>) => {
       setChannels((channels) => {
-        if (!lockChannelOrder && event.cid) {
-          return moveChannelUp<StreamChatGenerics>({
-            channels,
-            cid: event.cid,
-          });
+        if (!lockChannelOrder && event.cid && event.channel_type && event.channel_id) {
+          const targetChannelIndex = channels.findIndex((c) => c.cid === event.cid);
+
+          if (targetChannelIndex >= 0) {
+            return moveChannelUp<StreamChatGenerics>({
+              channels,
+              cid: event.cid,
+            });
+          }
+
+          // If channel doesn't exist in existing list, check in activeChannels as well.
+          // It may happen that channel was hidden using channel.hide(). In that case
+          // We remove it from `channels` state, but its still being watched and exists in client.activeChannels.
+          const channel = client.channel(event.channel_type, event.channel_id);
+
+          if (channel.initialized) {
+            return [channel, ...channels];
+          }
         }
+
         return [...channels];
       });
     };

package/src/components/ImageGallery/ImageGallery.tsx

@@ -65,6 +65,7 @@ import type { DefaultStreamChatGenerics } from '../../types/types';
 import { getResizedImageUrl } from '../../utils/getResizedImageUrl';
 import { getUrlOfImageAttachment } from '../../utils/getUrlOfImageAttachment';
 import { vh, vw } from '../../utils/utils';
+import { getGiphyMimeType } from '../Attachment/utils/getGiphyMimeType';
 
 const isAndroid = Platform.OS === 'android';
 const fullScreenHeight = Dimensions.get('screen').height;
@@ -280,7 +281,7 @@ export const ImageGallery = <
         created_at: cur.created_at,
         id: `photoId-${cur.id}-${imageUrl}`,
         messageId: cur.id,
-        mime_type: a.type === 'giphy' ? 'image/gif' : a.mime_type,
+        mime_type: a.type === 'giphy' ? getGiphyMimeType(giphyURL ?? '') : a.mime_type,
         original_height: a.original_height,
         original_width: a.original_width,
         type: a.type,