Skip to content

Commit 55d624a

Browse files
santhoshvaisanthoshvai
authored
Merge pull request #1972 from GetStream/develop
2 parents 36dde85 + 8df2869 commit 55d624a

File tree

8 files changed

+35
-29
lines changed

8 files changed

+35
-29
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
17-
token: ${{ secrets.VERSION_BUMP_TOKEN }}
17+
token: ${{ secrets.STREAM_CI_GITHUB_BOT_TOKEN }}
1818
# pulls all commits (needed for semantic release to correctly version)
1919
fetch-depth: '0'
2020
# pulls all tags (needed for semantic release to correctly version)

‎.github/workflows/sample-distribution.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717
with:
18-
token: ${{ secrets.VERSION_BUMP_TOKEN }}
18+
token: ${{ secrets.STREAM_CI_GITHUB_BOT_TOKEN }}
1919
- name: Install Ruby and Gems
2020
uses: ruby/setup-ruby@v1
2121
with:

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6672,10 +6672,10 @@ [email protected]:
66726672
version "0.0.0"
66736673
uid ""
66746674

6675-
stream-chat-react-native-core@5.10.0:
6676-
version "5.10.0"
6677-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
6678-
integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
6675+
stream-chat-react-native-core@5.11.0:
6676+
version "5.11.0"
6677+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
6678+
integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
66796679
dependencies:
66806680
"@babel/runtime" "^7.12.5"
66816681
"@gorhom/bottom-sheet" "4.4.5"

‎examples/SampleApp/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7605,10 +7605,10 @@ [email protected]:
76057605
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
76067606
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
76077607

7608-
stream-chat-react-native-core@5.10.0:
7609-
version "5.10.0"
7610-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
7611-
integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
7608+
stream-chat-react-native-core@5.11.0:
7609+
version "5.11.0"
7610+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
7611+
integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
76127612
dependencies:
76137613
"@babel/runtime" "^7.12.5"
76147614
"@gorhom/bottom-sheet" "4.4.5"

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7168,10 +7168,10 @@ statuses@~1.5.0:
71687168
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
71697169
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
71707170

7171-
stream-chat-react-native-core@5.10.0:
7172-
version "5.10.0"
7173-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
7174-
integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
7171+
stream-chat-react-native-core@5.11.0:
7172+
version "5.11.0"
7173+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
7174+
integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
71757175
dependencies:
71767176
"@babel/runtime" "^7.12.5"
71777177
"@gorhom/bottom-sheet" "4.4.5"

‎package/expo-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3005,10 +3005,10 @@ [email protected]:
30053005
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
30063006
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
30073007

3008-
stream-chat-react-native-core@5.10.0:
3009-
version "5.10.0"
3010-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
3011-
integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
3008+
stream-chat-react-native-core@5.11.0:
3009+
version "5.11.0"
3010+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
3011+
integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
30123012
dependencies:
30133013
"@babel/runtime" "^7.12.5"
30143014
"@gorhom/bottom-sheet" "4.4.5"

‎package/native-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4410,10 +4410,10 @@ statuses@~1.5.0:
44104410
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
44114411
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
44124412

4413-
stream-chat-react-native-core@5.10.0:
4414-
version "5.10.0"
4415-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.10.0.tgz#6539a878e93e56d9e04d6bb7dde63925984e5285"
4416-
integrity sha512-lJ1ON2tbSc80obGAdDHcSqzA5dtctcBy4sZ/s9AJYBOAfrQ6fw3HZhnft1YFoDg6tGJ0tOeDrwODSjlA3C4cNw==
4413+
stream-chat-react-native-core@5.11.0:
4414+
version "5.11.0"
4415+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.11.0.tgz#3842cc96afba111f4401f1e3c3b2f2bc9a9c8bad"
4416+
integrity sha512-PiQ7d0EJxKY4Cwr8DLjlFLSmE7mGzAKFz0fHQjsyuAlS1NXgm6fSmjH8S3zv7V+D+p+lRUTArAnviDYwQFRDdA==
44174417
dependencies:
44184418
"@babel/runtime" "^7.12.5"
44194419
"@gorhom/bottom-sheet" "4.4.5"

‎package/src/components/MessageList/MessageList.tsx‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -956,10 +956,19 @@ const MessageListWithContext = <
956956
});
957957
}
958958

959-
const renderListEmptyComponent = () => (
960-
<View style={[styles.flex, styles.invert]} testID='empty-state'>
961-
<EmptyStateIndicator listType='message' />
962-
</View>
959+
const shouldApplyAndroidWorkaround =
960+
inverted && Platform.OS === 'android' && Platform.Version >= 33;
961+
962+
const renderListEmptyComponent = useCallback(
963+
() => (
964+
<View
965+
style={[styles.flex, shouldApplyAndroidWorkaround ? styles.invertAndroid : styles.invert]}
966+
testID='empty-state'
967+
>
968+
<EmptyStateIndicator listType='message' />
969+
</View>
970+
),
971+
[EmptyStateIndicator, shouldApplyAndroidWorkaround],
963972
);
964973

965974
if (!FlatList) return null;
@@ -979,9 +988,6 @@ const MessageListWithContext = <
979988
return null;
980989
};
981990

982-
const shouldApplyAndroidWorkaround =
983-
inverted && Platform.OS === 'android' && Platform.Version >= 33;
984-
985991
return (
986992
<View
987993
style={[styles.container, { backgroundColor: white_snow }, container]}

0 commit comments

Comments
 (0)