Automated cherry pick of #8568 (#8572)

* MM-62915 and MM-62919 (#8568) (cherry picked from commit ee66890) * remove duplicate backgroundColor in search results header --------- Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
mattermost · Feb 7, 2025 · b00c550 · b00c550
1 parent 3d3542f
commit b00c550
Show file tree

Hide file tree

Showing 18 changed files with 200 additions and 168 deletions.
diff --git a/android/app/src/main/java/com/mattermost/helpers/Network.java b/android/app/src/main/java/com/mattermost/helpers/Network.java
@@ -10,6 +10,7 @@
 
 import com.mattermost.networkclient.ApiClientModuleImpl;
 import com.mattermost.networkclient.enums.RetryTypes;
+import com.mattermost.turbolog.TurboLog;
 
 import okhttp3.HttpUrl;
 import okhttp3.Response;
@@ -21,9 +22,12 @@ public class Network {
     private static final Promise emptyPromise = new ResolvePromise();
 
     public static void init(Context context) {
-        final ReactApplicationContext reactContext = (ApiClientModuleImpl.context == null) ? (ReactApplicationContext) context.getApplicationContext() : ApiClientModuleImpl.context;
-        clientModule = new ApiClientModuleImpl(reactContext);
-        createClientOptions();
+        if (clientModule == null) {
+            clientModule = new ApiClientModuleImpl(context);
+            createClientOptions();
+        } else {
+            TurboLog.Companion.i("ReactNative", "Network already initialized");
+        }
     }
 
     public static void get(String baseUrl, String endpoint, ReadableMap options, Promise promise) {

diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.kt b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.kt
@@ -33,7 +33,6 @@ class CustomPushNotification(
     init {
         try {
             DatabaseHelper.instance?.init(context)
-            Network.init(context)
             NotificationHelper.cleanNotificationPreferencesIfNeeded(context)
         } catch (e: Exception) {
             e.printStackTrace()
@@ -51,6 +50,7 @@ class CustomPushNotification(
         val isIdLoaded = initialData.getString("id_loaded") == "true"
         val notificationId = NotificationHelper.getNotificationId(initialData)
         val serverUrl = addServerUrlToBundle(initialData)
+        Network.init(mContext)
 
         GlobalScope.launch {
             try {

diff --git a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
@@ -13,19 +13,32 @@
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.Person;
 
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
 
 import com.mattermost.helpers.*;
 import com.mattermost.turbolog.TurboLog;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
+import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
 import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 
 public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
     private Context mContext;
     private Bundle bundle;
     private NotificationManager notificationManager;
 
+    private ReactApplicationContext getReactContext(Context context) {
+        if (context instanceof ReactApplication) {
+            ReactNativeHost host = ((ReactApplication) context).getReactNativeHost();
+            return (ReactApplicationContext) host.getReactInstanceManager().getCurrentReactContext();
+        }
+
+        return null;
+    }
+
     @Override
     public void onReceive(Context context, Intent intent) {
         try {
@@ -40,6 +53,7 @@ public void onReceive(Context context, Intent intent) {
 
             final int notificationId = intent.getIntExtra(CustomPushNotificationHelper.NOTIFICATION_ID, -1);
             final String serverUrl = bundle.getString("server_url");
+            Network.init(context);
             if (serverUrl != null) {
                     replyToMessage(serverUrl, notificationId, message);
             } else {

diff --git a/app/components/channel_item/__snapshots__/channel_item.test.tsx.snap b/app/components/channel_item/__snapshots__/channel_item.test.tsx.snap
@@ -92,7 +92,7 @@ exports[`components/channel_list/categories/body/channel_item should match snaps
               "lineHeight": 24,
             },
             {
-              "color": "#ffffff",
+              "color": "rgba(255,255,255,0.72)",
             },
             false,
             null,
@@ -213,7 +213,7 @@ exports[`components/channel_list/categories/body/channel_item should match snaps
               "lineHeight": 24,
             },
             {
-              "color": "#ffffff",
+              "color": "rgba(255,255,255,0.72)",
             },
             false,
             null,
@@ -251,7 +251,7 @@ exports[`components/channel_list/categories/body/channel_item should match snaps
               "lineHeight": 24,
             },
             {
-              "color": "#ffffff",
+              "color": "rgba(255,255,255,0.72)",
             },
             false,
             null,
@@ -361,7 +361,7 @@ exports[`components/channel_list/categories/body/channel_item should match snaps
               "lineHeight": 24,
             },
             {
-              "color": "#ffffff",
+              "color": "rgba(255,255,255,0.72)",
             },
             false,
             null,

diff --git a/app/components/channel_item/channel_item.tsx b/app/components/channel_item/channel_item.tsx
@@ -51,7 +51,7 @@ export const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
         marginRight: 12,
     },
     text: {
-        color: theme.sidebarText,
+        color: changeOpacity(theme.sidebarText, 0.72),
     },
     highlight: {
         color: theme.sidebarUnreadText,

diff --git a/app/components/threads_button/__snapshots__/threads_button.test.tsx.snap b/app/components/threads_button/__snapshots__/threads_button.test.tsx.snap
@@ -79,7 +79,7 @@ exports[`Thread item in the channel list Threads Component should match snapshot
             "lineHeight": 24,
           },
           {
-            "color": "#ffffff",
+            "color": "rgba(255,255,255,0.72)",
           },
           false,
           false,
@@ -174,7 +174,7 @@ exports[`Thread item in the channel list Threads Component should match snapshot
             "lineHeight": 24,
           },
           {
-            "color": "#ffffff",
+            "color": "rgba(255,255,255,0.72)",
           },
           false,
           false,

diff --git a/app/screens/home/account/account.tsx b/app/screens/home/account/account.tsx
@@ -1,8 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {useRoute} from '@react-navigation/native';
+import {useIsFocused, useRoute} from '@react-navigation/native';
 import React, {useCallback, useState} from 'react';
+import {Freeze} from 'react-freeze';
 import {ScrollView, View} from 'react-native';
 import Animated, {useAnimatedStyle, withTiming} from 'react-native-reanimated';
 import {type Edge, SafeAreaView, useSafeAreaInsets} from 'react-native-safe-area-context';
@@ -28,10 +29,6 @@ const edges: Edge[] = ['left', 'right'];
 
 const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
     return {
-        container: {
-            flex: 1,
-            backgroundColor: theme.sidebarBg,
-        },
         flex: {
             flex: 1,
         },
@@ -62,6 +59,7 @@ const AccountScreen = ({currentUser, enableCustomUserStatuses, showFullName}: Ac
     const route = useRoute();
     const insets = useSafeAreaInsets();
     const isTablet = useIsTablet();
+    const isFocused = useIsFocused();
 
     let tabletSidebarStyle;
     if (isTablet) {
@@ -113,27 +111,29 @@ const AccountScreen = ({currentUser, enableCustomUserStatuses, showFullName}: Ac
     ) : null;
 
     return (
-        <SafeAreaView
-            edges={edges}
-            style={styles.container}
-            testID='account.screen'
-        >
-            <View style={[{height: insets.top, flexDirection: 'row'}]}>
-                <View style={[styles.container, tabletSidebarStyle]}/>
-                {isTablet && <View style={styles.tabletContainer}/>}
-            </View>
-            <Animated.View
-                onLayout={onLayout}
-                style={[styles.flexRow, animated]}
+        <Freeze freeze={!isFocused}>
+            <SafeAreaView
+                edges={edges}
+                style={styles.flex}
+                testID='account.screen'
             >
-                {content}
-                {isTablet &&
-                <View style={[styles.tabletContainer, styles.tabletDivider]}>
-                    <AccountTabletView/>
+                <View style={[{height: insets.top, flexDirection: 'row'}]}>
+                    <View style={[styles.flex, tabletSidebarStyle]}/>
+                    {isTablet && <View style={styles.tabletContainer}/>}
                 </View>
-                }
-            </Animated.View>
-        </SafeAreaView>
+                <Animated.View
+                    onLayout={onLayout}
+                    style={[styles.flexRow, animated]}
+                >
+                    {content}
+                    {isTablet &&
+                    <View style={[styles.tabletContainer, styles.tabletDivider]}>
+                        <AccountTabletView/>
+                    </View>
+                    }
+                </Animated.View>
+            </SafeAreaView>
+        </Freeze>
     );
 };
 

diff --git a/app/screens/home/recent_mentions/recent_mentions.tsx b/app/screens/home/recent_mentions/recent_mentions.tsx
@@ -3,8 +3,9 @@
 
 import {useIsFocused, useRoute} from '@react-navigation/native';
 import React, {useCallback, useState, useEffect, useMemo} from 'react';
+import {Freeze} from 'react-freeze';
 import {useIntl} from 'react-intl';
-import {ActivityIndicator, DeviceEventEmitter, type ListRenderItemInfo, View} from 'react-native';
+import {ActivityIndicator, DeviceEventEmitter, type ListRenderItemInfo, StyleSheet, View} from 'react-native';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import {SafeAreaView, type Edge} from 'react-native-safe-area-context';
 
@@ -19,7 +20,6 @@ import {useServerUrl} from '@context/server';
 import {useTheme} from '@context/theme';
 import {useCollapsibleHeader} from '@hooks/header';
 import {getDateForDateLine, selectOrderedPosts} from '@utils/post_list';
-import {makeStyleSheetFromTheme} from '@utils/theme';
 
 import EmptyState from './components/empty';
 
@@ -35,20 +35,16 @@ type Props = {
     mentions: PostModel[];
 }
 
-const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+const styles = StyleSheet.create({
     flex: {
         flex: 1,
-        backgroundColor: theme.centerChannelBg,
-    },
-    container: {
-        flex: 1,
     },
     empty: {
         alignItems: 'center',
         flex: 1,
         justifyContent: 'center',
     },
-}));
+});
 
 const RecentMentionsScreen = ({appsEnabled, customEmojiNames, mentions, currentTimezone}: Props) => {
     const theme = useTheme();
@@ -58,7 +54,6 @@ const RecentMentionsScreen = ({appsEnabled, customEmojiNames, mentions, currentT
     const [refreshing, setRefreshing] = useState(false);
     const [loading, setLoading] = useState(true);
     const serverUrl = useServerUrl();
-    const styles = getStyleSheet(theme);
 
     const params = route.params as {direction: string};
     const toLeft = params.direction === 'left';
@@ -165,45 +160,47 @@ const RecentMentionsScreen = ({appsEnabled, customEmojiNames, mentions, currentT
     }, [appsEnabled, customEmojiNames]);
 
     return (
-        <ExtraKeyboardProvider>
-            <NavigationHeader
-                isLargeTitle={true}
-                showBackButton={false}
-                subtitle={subtitle}
-                title={title}
-                hasSearch={false}
-                scrollValue={scrollValue}
-            />
-            <SafeAreaView
-                style={styles.flex}
-                edges={EDGES}
-                testID='recent_mentions.screen'
-            >
-                <Animated.View style={[styles.container, animated]}>
-                    <Animated.View style={top}>
-                        <RoundedHeaderContext/>
+        <Freeze freeze={!isFocused}>
+            <ExtraKeyboardProvider>
+                <NavigationHeader
+                    isLargeTitle={true}
+                    showBackButton={false}
+                    subtitle={subtitle}
+                    title={title}
+                    hasSearch={false}
+                    scrollValue={scrollValue}
+                />
+                <SafeAreaView
+                    style={styles.flex}
+                    edges={EDGES}
+                    testID='recent_mentions.screen'
+                >
+                    <Animated.View style={[styles.flex, animated]}>
+                        <Animated.View style={top}>
+                            <RoundedHeaderContext/>
+                        </Animated.View>
+                        <Animated.FlatList
+                            ref={scrollRef}
+                            contentContainerStyle={paddingTop}
+                            ListEmptyComponent={renderEmptyList()}
+                            data={posts}
+                            scrollToOverflowEnabled={true}
+                            showsVerticalScrollIndicator={false}
+                            progressViewOffset={scrollPaddingTop}
+                            scrollEventThrottle={16}
+                            indicatorStyle='black'
+                            onScroll={onScroll}
+                            onRefresh={handleRefresh}
+                            refreshing={refreshing}
+                            renderItem={renderItem}
+                            removeClippedSubviews={true}
+                            onViewableItemsChanged={onViewableItemsChanged}
+                            testID='recent_mentions.post_list.flat_list'
+                        />
                     </Animated.View>
-                    <Animated.FlatList
-                        ref={scrollRef}
-                        contentContainerStyle={paddingTop}
-                        ListEmptyComponent={renderEmptyList()}
-                        data={posts}
-                        scrollToOverflowEnabled={true}
-                        showsVerticalScrollIndicator={false}
-                        progressViewOffset={scrollPaddingTop}
-                        scrollEventThrottle={16}
-                        indicatorStyle='black'
-                        onScroll={onScroll}
-                        onRefresh={handleRefresh}
-                        refreshing={refreshing}
-                        renderItem={renderItem}
-                        removeClippedSubviews={true}
-                        onViewableItemsChanged={onViewableItemsChanged}
-                        testID='recent_mentions.post_list.flat_list'
-                    />
-                </Animated.View>
-            </SafeAreaView>
-        </ExtraKeyboardProvider>
+                </SafeAreaView>
+            </ExtraKeyboardProvider>
+        </Freeze>
     );
 };