From 2583b470b28a9737fae1b9ee9059a00d5caa5cae Mon Sep 17 00:00:00 2001 From: Paul Vrn <78180340+Paul-vrn@users.noreply.github.com> Date: Mon, 30 Oct 2023 04:53:15 +0100 Subject: [PATCH 1/4] [MM-54599] Fix Servers bottom sheet (#7609) --- app/screens/home/channel_list/servers/index.tsx | 15 +++++++++++---- .../channel_list/servers/servers_list/index.tsx | 7 ++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/screens/home/channel_list/servers/index.tsx b/app/screens/home/channel_list/servers/index.tsx index a1135ce4f..307c9a5af 100644 --- a/app/screens/home/channel_list/servers/index.tsx +++ b/app/screens/home/channel_list/servers/index.tsx @@ -3,7 +3,7 @@ import React, {useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react'; import {useIntl} from 'react-intl'; -import {StyleSheet} from 'react-native'; +import {Dimensions, StyleSheet} from 'react-native'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import ServerIcon from '@components/server_icon'; @@ -27,7 +27,8 @@ export type ServersRef = { openServers: () => void; } -export const SERVER_ITEM_HEIGHT = 72; +export const SERVER_ITEM_HEIGHT = 75; +export const PUSH_ALERT_TEXT_HEIGHT = 42; const subscriptions: Map = new Map(); const styles = StyleSheet.create({ @@ -116,12 +117,18 @@ const Servers = React.forwardRef((_, ref) => { ); }; + const maxScreenHeight = Math.ceil(0.6 * Dimensions.get('window').height); + const maxSnapPoint = Math.min( + maxScreenHeight, + bottomSheetSnapPoint(registeredServers.current.length, SERVER_ITEM_HEIGHT, bottom) + TITLE_HEIGHT + BUTTON_HEIGHT + + (registeredServers.current.filter((s: ServersModel) => s.lastActiveAt).length * PUSH_ALERT_TEXT_HEIGHT), + ); const snapPoints: BottomSheetProps['snapPoints'] = [ 1, - bottomSheetSnapPoint(Math.min(2.5, registeredServers.current.length), 72, bottom) + TITLE_HEIGHT + BUTTON_HEIGHT, + maxSnapPoint, ]; - if (registeredServers.current.length > 1) { + if (maxSnapPoint === maxScreenHeight) { snapPoints.push('80%'); } diff --git a/app/screens/home/channel_list/servers/servers_list/index.tsx b/app/screens/home/channel_list/servers/servers_list/index.tsx index 22cac4f22..ead1bf96d 100644 --- a/app/screens/home/channel_list/servers/servers_list/index.tsx +++ b/app/screens/home/channel_list/servers/servers_list/index.tsx @@ -4,11 +4,12 @@ import {BottomSheetFlatList} from '@gorhom/bottom-sheet'; import React, {useCallback, useMemo} from 'react'; import {useIntl} from 'react-intl'; -import {FlatList, type ListRenderItemInfo, StyleSheet, View} from 'react-native'; +import {FlatList, StyleSheet, View, type ListRenderItemInfo} from 'react-native'; import {useServerUrl} from '@context/server'; import {useTheme} from '@context/theme'; import {useIsTablet} from '@hooks/device'; +import {BUTTON_HEIGHT} from '@screens/bottom_sheet'; import BottomSheetContent from '@screens/bottom_sheet/content'; import {addNewServer} from '@utils/server'; @@ -29,6 +30,9 @@ const styles = StyleSheet.create({ contentContainer: { marginVertical: 4, }, + serverList: { + marginBottom: BUTTON_HEIGHT, + }, }); const keyExtractor = (item: ServersModel) => item.url; @@ -68,6 +72,7 @@ const ServerList = ({servers}: Props) => { Date: Mon, 30 Oct 2023 09:46:49 +0100 Subject: [PATCH 2/4] Fix notifications not opening or going to the wrong channel on Android (#7634) * Fix notifications not opening or going to the wrong channel on Android * Update podfile --- ios/Podfile.lock | 6 +- package-lock.json | 166 ++++++------------ package.json | 2 +- ...=> react-native-notifications+5.1.0.patch} | 18 +- 4 files changed, 72 insertions(+), 120 deletions(-) rename patches/{react-native-notifications+5.0.0.patch => react-native-notifications+5.1.0.patch} (97%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3b04b7c0a..69a4e3a57 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -385,7 +385,7 @@ PODS: - React-Core - Starscream (~> 4.0.4) - SwiftyJSON (~> 5.0) - - react-native-notifications (5.0.0): + - react-native-notifications (5.1.0): - React-Core - react-native-paste-input (0.6.4): - React-Core @@ -946,7 +946,7 @@ SPEC CHECKSUMS: react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4 react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5 react-native-network-client: 953ab4d0914fdde6dc40924b5faad8631a587d4e - react-native-notifications: d309f7080aad71206882dbb98d9ed788969f3b6d + react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4 react-native-paste-input: 09f14cbfb646ad9d2ef79cdc6f3d45f337c10ad1 react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 @@ -1001,4 +1001,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 25f07cb9e5eed8c84db8e8723000e8470c349058 -COCOAPODS: 1.11.3 +COCOAPODS: 1.14.2 diff --git a/package-lock.json b/package-lock.json index aae1845dd..2283bdf25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "mattermost-mobile", - "version": "2.9.0", + "version": "2.10.0", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { @@ -82,7 +82,7 @@ "react-native-localize": "3.0.2", "react-native-math-view": "3.9.5", "react-native-navigation": "7.37.0", - "react-native-notifications": "5.0.0", + "react-native-notifications": "5.1.0", "react-native-permissions": "3.8.4", "react-native-reanimated": "3.4.2", "react-native-safe-area-context": "4.7.1", @@ -19506,9 +19506,9 @@ "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, "node_modules/react-native-notifications": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-native-notifications/-/react-native-notifications-5.0.0.tgz", - "integrity": "sha512-QXtBBmbDtwq9X8WAPLn+OctIeEtnJOQ+RCT6iweaypvFTydt2baLPtawTAbCSXKuWpVDqDAdmZnlQjCcavNzoA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/react-native-notifications/-/react-native-notifications-5.1.0.tgz", + "integrity": "sha512-laqDSDlCvEASmJR6cXpqaryK855ejQd07vrfYERzhv68YDOoSkKy/URExRP4vAfAOVqHhix80tLbNUcfvZk2VQ==", "peerDependencies": { "react": "*", "react-native": "*" @@ -23596,8 +23596,7 @@ "version": "7.21.0-placeholder-for-preset-env.2", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", - "requires": { - } + "requires": {} }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", @@ -25420,8 +25419,7 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/@mattermost/react-native-emm/-/react-native-emm-1.3.5.tgz", "integrity": "sha512-REdUEsm/RA6lI1Rt4b009jvWn28f7H+e27gd4hlNk6zesIh/dlfiHwYfInW/vwbNFBdSPpvHy7Qi2mdcvrNqhg==", - "requires": { - } + "requires": {} }, "@mattermost/react-native-network-client": { "version": "1.4.1", @@ -25444,8 +25442,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/@mattermost/react-native-turbo-log/-/react-native-turbo-log-0.2.3.tgz", "integrity": "sha512-usWyD8zVAHzrYqgPH1ne5I14gCOkhS2mefK58g5v4DewZfCm0/Uc0w8MRuPS/9jyOPPq1rUZj8U1AqKgEne9tQ==", - "requires": { - } + "requires": {} }, "@msgpack/msgpack": { "version": "2.8.0", @@ -25537,15 +25534,13 @@ "version": "5.7.2", "resolved": "https://registry.npmjs.org/@react-native-camera-roll/camera-roll/-/camera-roll-5.7.2.tgz", "integrity": "sha512-s8VAUG1Kvi+tEJkLHObmOJdXAL/uclnXJ/IdnJtx2fCKiWA3Ho0ln9gDQqCYHHHHu+sXk7wovsH/I2/AYy0brg==", - "requires": { - } + "requires": {} }, "@react-native-clipboard/clipboard": { "version": "1.11.2", "resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.11.2.tgz", "integrity": "sha512-bHyZVW62TuleiZsXNHS1Pv16fWc0fh8O9WvBzl4h2fykqZRW9a+Pv/RGTH56E3X2PqzHP38K5go8zmCZUoIsoQ==", - "requires": { - } + "requires": {} }, "@react-native-community/cli": { "version": "10.2.4", @@ -27254,8 +27249,7 @@ "version": "9.4.1", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-9.4.1.tgz", "integrity": "sha512-dAbY5mfw+6Kas/GJ6QX9AZyY+K+eq9ad4Su6utoph/nxyH3whp5cMSgRNgE2VhGQVRZ/OG0qq3IaD3+wzoqJXw==", - "requires": { - } + "requires": {} }, "@react-native-cookies/cookies": { "version": "6.2.1", @@ -27421,8 +27415,7 @@ "version": "1.3.18", "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.18.tgz", "integrity": "sha512-/0hwnJkrr415yP0Hf4PjUKgGyfshrvNUKFXN85Mrt1gY49hy9IwxZgrrxlh0THXkPeq8q4VWw44eHDfAcQf20Q==", - "requires": { - } + "requires": {} }, "@react-navigation/native": { "version": "6.1.7", @@ -27649,72 +27642,63 @@ "version": "0.10.3", "resolved": "https://registry.npmjs.org/@stream-io/flat-list-mvcp/-/flat-list-mvcp-0.10.3.tgz", "integrity": "sha512-2ZK8piYlEfKIPZrH8BpZz9uj8HZcUvMCV0X7qSLSAc/vhLOANBfR0SSn0OaWPbqb2mFGAd4FxmLSPp1zKEYuaw==", - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-add-jsx-attribute": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz", "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-remove-jsx-attribute": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz", "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-remove-jsx-empty-expression": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz", "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-replace-jsx-attribute-value": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz", "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-svg-dynamic-title": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz", "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-svg-em-dimensions": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz", "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-transform-react-native-svg": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.0.0.tgz", "integrity": "sha512-UKrY3860AQICgH7g+6h2zkoxeVEPLYwX/uAjmqo4PIq2FIHppwhIqZstIyTz0ZtlwreKR41O3W3BzsBBiJV2Aw==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-plugin-transform-svg-component": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz", "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==", "dev": true, - "requires": { - } + "requires": {} }, "@svgr/babel-preset": { "version": "8.0.0", @@ -28521,8 +28505,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/@voximplant/react-native-foreground-service/-/react-native-foreground-service-3.0.2.tgz", "integrity": "sha512-ZIyccOAXPqznA1PAVAYlKZ+GI7kXYCuYgH+gmAkhPouyJbkgrSXaCJJzQ+uBkPr4FBa/PuC/yjzK8vf6tJREQA==", - "requires": { - } + "requires": {} }, "@webassemblyjs/ast": { "version": "1.11.1", @@ -28690,8 +28673,7 @@ "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", "dev": true, - "requires": { - } + "requires": {} }, "@webpack-cli/info": { "version": "1.4.0", @@ -28707,8 +28689,7 @@ "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", "dev": true, - "requires": { - } + "requires": {} }, "@xtuc/ieee754": { "version": "1.2.0", @@ -28763,15 +28744,13 @@ "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", "dev": true, "peer": true, - "requires": { - } + "requires": {} }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": { - } + "requires": {} }, "agent-base": { "version": "6.0.2", @@ -28827,8 +28806,7 @@ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, "peer": true, - "requires": { - } + "requires": {} }, "anser": { "version": "1.4.10", @@ -29106,8 +29084,7 @@ "version": "7.0.0-bridge.0", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==", - "requires": { - } + "requires": {} }, "babel-jest": { "version": "29.6.2", @@ -30308,8 +30285,7 @@ "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", "dev": true, - "requires": { - } + "requires": {} }, "deep-equal": { "version": "2.2.2", @@ -31212,8 +31188,7 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "requires": { - } + "requires": {} }, "eslint-import-resolver-node": { "version": "0.3.7", @@ -31298,8 +31273,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz", "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==", "dev": true, - "requires": { - } + "requires": {} }, "eslint-plugin-import": { "version": "2.28.0", @@ -31433,8 +31407,7 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "requires": { - } + "requires": {} }, "eslint-plugin-react-native": { "version": "4.0.0", @@ -33808,8 +33781,7 @@ "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, - "requires": { - } + "requires": {} }, "jest-regex-util": { "version": "29.4.3", @@ -37037,8 +37009,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz", "integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==", - "requires": { - } + "requires": {} }, "react-intl": { "version": "6.4.4", @@ -37347,8 +37318,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/react-native-background-timer/-/react-native-background-timer-2.4.1.tgz", "integrity": "sha512-TE4Kiy7jUyv+hugxDxitzu38sW1NqjCk4uE5IgU2WevLv7sZacaBc6PZKOShNRPGirLl1NWkaG3LDEkdb9Um5g==", - "requires": { - } + "requires": {} }, "react-native-button": { "version": "3.1.0", @@ -37401,15 +37371,13 @@ "version": "1.6.4", "resolved": "https://registry.npmjs.org/react-native-create-thumbnail/-/react-native-create-thumbnail-1.6.4.tgz", "integrity": "sha512-JWuKXswDXtqUPfuqh6rjCVMvTSSG3kUtwvSK/YdaNU0i+nZKxeqHmt/CO2+TyI/WSUFynGVmWT1xOHhCZAFsRQ==", - "requires": { - } + "requires": {} }, "react-native-device-info": { "version": "10.8.0", "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-10.8.0.tgz", "integrity": "sha512-DE4/X82ZVhdcnR1Y21iTP46WSSJA/rHK3lmeqWfGGq1RKLwXTIdxmfbZZnYwryqJ+esrw2l4ND19qlgxDGby8A==", - "requires": { - } + "requires": {} }, "react-native-document-picker": { "version": "9.0.1", @@ -37446,22 +37414,19 @@ "version": "2.10.10", "resolved": "https://registry.npmjs.org/react-native-exception-handler/-/react-native-exception-handler-2.10.10.tgz", "integrity": "sha512-otAXGoZDl1689OoUJWN/rXxVbdoZ3xcmyF1uq/CsizdLwwyZqVGd6d+p/vbYvnF996FfEyAEBnHrdFxulTn51w==", - "requires": { - } + "requires": {} }, "react-native-fast-image": { "version": "8.6.3", "resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz", "integrity": "sha512-Sdw4ESidXCXOmQ9EcYguNY2swyoWmx53kym2zRsvi+VeFCHEdkO+WG1DK+6W81juot40bbfLNhkc63QnWtesNg==", - "requires": { - } + "requires": {} }, "react-native-file-viewer": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/react-native-file-viewer/-/react-native-file-viewer-2.1.5.tgz", "integrity": "sha512-MGC6sx9jsqHdefhVQ6o0akdsPGpkXgiIbpygb2Sg4g4bh7v6K1cardLV1NwGB9A6u1yICOSDT/MOC//9Ez6EUg==", - "requires": { - } + "requires": {} }, "react-native-fs": { "version": "2.20.0", @@ -37500,22 +37465,19 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/react-native-haptic-feedback/-/react-native-haptic-feedback-2.0.3.tgz", "integrity": "sha512-7+qvcxXZts/hA+HOOIFyM1x9m9fn/TJVSTgXaoQ8uT4gLc97IMvqHQ559tDmnlth+hHMzd3HRMpmRLWoKPL0DA==", - "requires": { - } + "requires": {} }, "react-native-hw-keyboard-event": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/react-native-hw-keyboard-event/-/react-native-hw-keyboard-event-0.0.4.tgz", "integrity": "sha512-G8qp0nm17PHigLb/axgdF9xg51BKCG2p1AGeq//J/luLp5zNczIcQJh+nm02R1MeEUE3e53wqO4LMe0MV3raZg==", - "requires": { - } + "requires": {} }, "react-native-image-picker": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/react-native-image-picker/-/react-native-image-picker-5.6.1.tgz", "integrity": "sha512-LPPlgJi97EzCDY4NWp7z0oUWmCbagnB6HSoKcLJHJD/DaFYN/dJPrqjqKaqqw8K/5Ze6DIsNg9PZohjNEYQQWQ==", - "requires": { - } + "requires": {} }, "react-native-in-app-review": { "version": "4.3.3", @@ -37526,15 +37488,13 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/react-native-incall-manager/-/react-native-incall-manager-4.1.0.tgz", "integrity": "sha512-v1c+XOGu5VudY5//E3i5xiaRA9v6RvevMzZ4RumLqI+hte+4XslB2z6HSek2FF0EmAnY1rCn4ckiwgkTI1Tmtw==", - "requires": { - } + "requires": {} }, "react-native-iphone-x-helper": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==", - "requires": { - } + "requires": {} }, "react-native-keyboard-aware-scroll-view": { "version": "0.9.5", @@ -37549,8 +37509,7 @@ "version": "5.7.0", "resolved": "https://registry.npmjs.org/react-native-keyboard-tracking-view/-/react-native-keyboard-tracking-view-5.7.0.tgz", "integrity": "sha512-MDeEwAbn9LJDOfHq0QLCGaZirVLk2X/tHqkAqz3y6uxryTRdSl9PwleOVar5Jx2oAPEg4J9BXbUD1wwOOi+5Kg==", - "requires": { - } + "requires": {} }, "react-native-keychain": { "version": "8.1.2", @@ -37561,15 +37520,13 @@ "version": "2.8.2", "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.8.2.tgz", "integrity": "sha512-hgmCsgzd58WNcDCyPtKrvxsaoETjb/jLGxis/dmU3Aqm2u4ICIduj4ECjbil7B7pm9OnuTkmpwXu08XV2mpg8g==", - "requires": { - } + "requires": {} }, "react-native-localize": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/react-native-localize/-/react-native-localize-3.0.2.tgz", "integrity": "sha512-/l/oE1LVNgIRRhLbhmfFMHiWV0xhUn0A0iz1ytLVRYywL7FTp8Rx2vkJS/q/RpExDvV7yLw2493XZBYIM1dnLQ==", - "requires": { - } + "requires": {} }, "react-native-math-view": { "version": "3.9.5", @@ -37602,11 +37559,10 @@ } }, "react-native-notifications": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-native-notifications/-/react-native-notifications-5.0.0.tgz", - "integrity": "sha512-QXtBBmbDtwq9X8WAPLn+OctIeEtnJOQ+RCT6iweaypvFTydt2baLPtawTAbCSXKuWpVDqDAdmZnlQjCcavNzoA==", - "requires": { - } + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/react-native-notifications/-/react-native-notifications-5.1.0.tgz", + "integrity": "sha512-laqDSDlCvEASmJR6cXpqaryK855ejQd07vrfYERzhv68YDOoSkKy/URExRP4vAfAOVqHhix80tLbNUcfvZk2VQ==", + "requires": {} }, "react-native-permissions": { "version": "3.8.4", @@ -37647,8 +37603,7 @@ "version": "4.7.1", "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.1.tgz", "integrity": "sha512-X2pJG2ttmAbiGlItWedvDkZg1T1ikmEDiz+7HsiIwAIm2UbFqlhqn+B1JF53mSxPzdNaDcCQVHRNPvj8oFu6Yg==", - "requires": { - } + "requires": {} }, "react-native-screens": { "version": "3.24.0", @@ -37681,8 +37636,7 @@ "version": "0.3.1", "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.3.1.tgz", "integrity": "sha512-mKOfBLIBFBcs9br1rlZDvxD5+mAl8Gfr5CounwJtxI6Z82rGrMO+Kgl9EIg3RMVf3G855a85YVqHJL2f5EDRlw==", - "requires": { - } + "requires": {} }, "react-native-svg": { "version": "13.11.0", @@ -39356,8 +39310,7 @@ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", "dev": true, - "requires": { - } + "requires": {} }, "ts-jest": { "version": "29.1.1", @@ -39678,15 +39631,13 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.6.tgz", "integrity": "sha512-VO/P91A/PmKH9bcN9a7O3duSuxe6M14ZoYXgA6a8dab8doWNdhiIHzEkX/jFeTTRBsX0Ubk6nG4q2NIjNsj+bg==", - "requires": { - } + "requires": {} }, "use-sync-external-store": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", - "requires": { - } + "requires": {} }, "utf8": { "version": "3.0.0", @@ -40019,8 +39970,7 @@ "version": "7.5.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", - "requires": { - } + "requires": {} }, "xdate": { "version": "0.8.2", diff --git a/package.json b/package.json index cf6e99745..14ce54531 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "react-native-localize": "3.0.2", "react-native-math-view": "3.9.5", "react-native-navigation": "7.37.0", - "react-native-notifications": "5.0.0", + "react-native-notifications": "5.1.0", "react-native-permissions": "3.8.4", "react-native-reanimated": "3.4.2", "react-native-safe-area-context": "4.7.1", diff --git a/patches/react-native-notifications+5.0.0.patch b/patches/react-native-notifications+5.1.0.patch similarity index 97% rename from patches/react-native-notifications+5.0.0.patch rename to patches/react-native-notifications+5.1.0.patch index e652f3263..dcb96e769 100644 --- a/patches/react-native-notifications+5.0.0.patch +++ b/patches/react-native-notifications+5.1.0.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/react-native-notifications/lib/android/app/build.gradle b/node_modules/react-native-notifications/lib/android/app/build.gradle -index d049e84..9ad7004 100644 +index 30bb01c..bba788d 100644 --- a/node_modules/react-native-notifications/lib/android/app/build.gradle +++ b/node_modules/react-native-notifications/lib/android/app/build.gradle @@ -96,9 +96,9 @@ android { @@ -7,10 +7,10 @@ index d049e84..9ad7004 100644 testOptions { unitTests.all { t -> - reports { -- html.enabled true +- html.required.set true - } + // reports { -+ // html.enabled true ++ // html.required.set true + // } testLogging { events "PASSED", "SKIPPED", "FAILED", "standardOut", "standardError" @@ -90,10 +90,10 @@ index 5b7f15f..9381794 100644 } } diff --git a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java -index 1e7e871..62e5cb8 100644 +index 1e7e871..36b96b6 100644 --- a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java +++ b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java -@@ -14,17 +14,9 @@ public class NotificationIntentAdapter { +@@ -14,17 +14,11 @@ public class NotificationIntentAdapter { @SuppressLint("UnspecifiedImmutableFlag") public static PendingIntent createPendingNotificationIntent(Context appContext, PushNotificationProps notification) { @@ -108,9 +108,11 @@ index 1e7e871..62e5cb8 100644 - taskStackBuilder.addNextIntentWithParentStack(mainActivityIntent); - return taskStackBuilder.getPendingIntent((int) System.currentTimeMillis(), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE); - } -+ Intent intent = appContext.getPackageManager().getLaunchIntentForPackage(appContext.getPackageName()); -+ intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle()); -+ return PendingIntent.getActivity(appContext, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE); ++ Intent mainActivityIntent = appContext.getPackageManager().getLaunchIntentForPackage(appContext.getPackageName()); ++ mainActivityIntent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle()); ++ TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(appContext); ++ taskStackBuilder.addNextIntentWithParentStack(mainActivityIntent); ++ return taskStackBuilder.getPendingIntent((int) System.currentTimeMillis(), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE); } public static boolean canHandleTrampolineActivity(Context appContext) { From d8d607257f557c17aaad3d756f100cc24839629e Mon Sep 17 00:00:00 2001 From: Tanmay Vardhaman Thole <72058456+tanmaythole@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:43:52 +0530 Subject: [PATCH 3/4] copy header text in channel info implemented (#7605) * copy header text in channel info implemented * changes fixed --- app/components/markdown/markdown.tsx | 8 +- .../markdown/markdown_link/markdown_link.tsx | 10 +- app/screens/channel_info/extra/extra.tsx | 144 +++++++++++++++--- assets/base/i18n/en.json | 1 + 4 files changed, 139 insertions(+), 24 deletions(-) diff --git a/app/components/markdown/markdown.tsx b/app/components/markdown/markdown.tsx index f16237245..36bcd7f04 100644 --- a/app/components/markdown/markdown.tsx +++ b/app/components/markdown/markdown.tsx @@ -71,6 +71,7 @@ type MarkdownProps = { textStyles?: MarkdownTextStyles; theme: Theme; value?: string; + onLinkLongPress?: (url?: string) => void; } const getStyleSheet = makeStyleSheetFromTheme((theme) => { @@ -133,7 +134,7 @@ const Markdown = ({ enableInlineLatex, enableLatex, maxNodes, imagesMetadata, isEdited, isReplyPost, isSearchResult, layoutHeight, layoutWidth, location, mentionKeys, minimumHashtagLength = 3, onPostPress, postId, searchPatterns, - textStyles = {}, theme, value = '', baseParagraphStyle, + textStyles = {}, theme, value = '', baseParagraphStyle, onLinkLongPress, }: MarkdownProps) => { const style = getStyleSheet(theme); const managedConfig = useManagedConfig(); @@ -402,7 +403,10 @@ const Markdown = ({ const renderLink = ({children, href}: {children: ReactElement; href: string}) => { return ( - + {children} ); diff --git a/app/components/markdown/markdown_link/markdown_link.tsx b/app/components/markdown/markdown_link/markdown_link.tsx index 64dee57b8..4cc662260 100644 --- a/app/components/markdown/markdown_link/markdown_link.tsx +++ b/app/components/markdown/markdown_link/markdown_link.tsx @@ -23,6 +23,7 @@ type MarkdownLinkProps = { experimentalNormalizeMarkdownLinks: string; href: string; siteURL: string; + onLinkLongPress?: (url?: string) => void; } const style = StyleSheet.create({ @@ -44,7 +45,7 @@ const parseLinkLiteral = (literal: string) => { return parsed.href; }; -const MarkdownLink = ({children, experimentalNormalizeMarkdownLinks, href, siteURL}: MarkdownLinkProps) => { +const MarkdownLink = ({children, experimentalNormalizeMarkdownLinks, href, siteURL, onLinkLongPress}: MarkdownLinkProps) => { const intl = useIntl(); const {bottom} = useSafeAreaInsets(); const managedConfig = useManagedConfig(); @@ -109,6 +110,11 @@ const MarkdownLink = ({children, experimentalNormalizeMarkdownLinks, href, siteU const handleLongPress = useCallback(() => { if (managedConfig?.copyAndPasteProtection !== 'true') { + if (onLinkLongPress) { + onLinkLongPress(href); + return; + } + const renderContent = () => { return ( ({ }, })); +const style = StyleSheet.create({ + bottomSheet: { + flex: 1, + }, +}); + +const headerTestId = 'channel_info.extra.header'; + +const onCopy = async (text: string, isLink?: boolean) => { + Clipboard.setString(text); + await dismissBottomSheet(); + if ((Platform.OS === OS_VERSION.ANDROID && Number(Platform.Version) < ANDROID_33) || Platform.OS === OS_VERSION.IOS) { + showSnackBar({ + barType: isLink ? SNACK_BAR_TYPE.LINK_COPIED : SNACK_BAR_TYPE.TEXT_COPIED, + }); + } +}; + const Extra = ({channelId, createdAt, createdBy, customStatus, header, isCustomStatusEnabled}: Props) => { + const intl = useIntl(); + const {bottom} = useSafeAreaInsets(); const theme = useTheme(); + const managedConfig = useManagedConfig(); + const styles = getStyleSheet(theme); const blockStyles = getMarkdownBlockStyles(theme); const textStyles = getMarkdownTextStyles(theme); @@ -81,6 +114,70 @@ const Extra = ({channelId, createdAt, createdBy, customStatus, header, isCustomS ), }), [createdAt, createdBy, theme]); + const handleLongPress = useCallback((url?: string) => { + if (managedConfig?.copyAndPasteProtection !== 'true') { + const renderContent = () => ( + + { + onCopy(header!); + }} + testID={`${headerTestId}.bottom_sheet.copy_header_text`} + text={intl.formatMessage({ + id: 'mobile.markdown.copy_header', + defaultMessage: 'Copy header text', + })} + /> + {Boolean(url) && ( + { + onCopy(url!, true); + }} + testID={`${headerTestId}.bottom_sheet.copy_url`} + text={intl.formatMessage({ + id: 'mobile.markdown.link.copy_url', + defaultMessage: 'Copy URL', + })} + /> + )} + { + dismissBottomSheet(); + }} + testID={`${headerTestId}.bottom_sheet.cancel`} + text={intl.formatMessage({ + id: 'mobile.post.cancel', + defaultMessage: 'Cancel', + })} + /> + + ); + + bottomSheet({ + closeButtonId: 'close-markdown-link', + renderContent, + snapPoints: [1, bottomSheetSnapPoint(url ? 3 : 2, ITEM_HEIGHT, bottom)], + title: intl.formatMessage({id: 'post.options.title', defaultMessage: 'Options'}), + theme, + }); + } + }, [ + header, + bottom, + theme, + intl.formatMessage, + managedConfig?.copyAndPasteProtection, + ]); + + const touchableHandleLongPress = useCallback(() => handleLongPress(), [handleLongPress]); + return ( {isCustomStatusEnabled && Boolean(customStatus) && @@ -131,25 +228,32 @@ const Extra = ({channelId, createdAt, createdBy, customStatus, header, isCustomS id='channel_info.header' defaultMessage='Header:' style={styles.extraHeading} - testID='channel_info.extra.header' - /> - + + + } {Boolean(createdAt && createdBy) && diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index 0f93b5a28..1e4606926 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -613,6 +613,7 @@ "mobile.managed.settings": "Go to settings", "mobile.markdown.code.copy_code": "Copy Code", "mobile.markdown.code.plusMoreLines": "+{count, number} more {count, plural, one {line} other {lines}}", + "mobile.markdown.copy_header": "Copy header text", "mobile.markdown.image.too_large": "Image exceeds max dimensions of {maxWidth} by {maxHeight}:", "mobile.markdown.link.copy_url": "Copy URL", "mobile.mention.copy_mention": "Copy Mention", From 128be0994e80037645ad940211a6d66ff169aada Mon Sep 17 00:00:00 2001 From: Harshal sanghvi Date: Mon, 30 Oct 2023 18:47:00 +0530 Subject: [PATCH 4/4] fixed theme save on android back button (#7579) --- .../settings/display_theme/display_theme.tsx | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/app/screens/settings/display_theme/display_theme.tsx b/app/screens/settings/display_theme/display_theme.tsx index 19c544c3a..76ae88368 100644 --- a/app/screens/settings/display_theme/display_theme.tsx +++ b/app/screens/settings/display_theme/display_theme.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React, {useCallback, useMemo} from 'react'; +import React, {useCallback, useMemo, useState, useEffect} from 'react'; import {savePreference} from '@actions/remote/preference'; import SettingContainer from '@components/settings/container'; @@ -26,17 +26,22 @@ const DisplayTheme = ({allowedThemeKeys, componentId, currentTeamId, currentUser const serverUrl = useServerUrl(); const theme = useTheme(); const initialTheme = useMemo(() => theme, [/* dependency array should remain empty */]); + const [newTheme, setNewTheme] = useState(undefined); const close = () => popTopScreen(componentId); - const setThemePreference = useCallback((newTheme?: string) => { - const allowedTheme = allowedThemeKeys.find((tk) => tk === newTheme); + useEffect(() => { const differentTheme = theme.type?.toLowerCase() !== newTheme?.toLowerCase(); if (!differentTheme) { close(); return; } + setThemePreference(); + }, [newTheme]); + + const setThemePreference = useCallback(() => { + const allowedTheme = allowedThemeKeys.find((tk) => tk === newTheme); const themeJson = Preferences.THEMES[allowedTheme as ThemeKey] || initialTheme; @@ -47,15 +52,20 @@ const DisplayTheme = ({allowedThemeKeys, componentId, currentTeamId, currentUser value: JSON.stringify(themeJson), }; savePreference(serverUrl, [pref]); - }, [allowedThemeKeys, currentTeamId, theme.type, serverUrl]); + }, [allowedThemeKeys, currentTeamId, theme.type, serverUrl, newTheme]); - useAndroidHardwareBackHandler(componentId, setThemePreference); + const onAndroidBack = () => { + setThemePreference(); + close(); + }; + + useAndroidHardwareBackHandler(componentId, onAndroidBack); return ( {initialTheme.type === 'custom' && (