toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Maintenance fixes (#7665)

Browse source
This commit is contained in:
Daniel Espino García 2023-11-15 15:07:00 +01:00 committed by GitHub
parent f0334d8c0e
commit 94e1334ebb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/post_list/more_messages/more_messages.tsx
View file

@ -7,7 +7,7 @@ import Animated, {interpolate, useAnimatedStyle, useSharedValue, withSpring} fro
import {useSafeAreaInsets} from 'react-native-safe-area-context';
import {resetMessageCount} from '@actions/local/channel';
import {useCallsAdjustment} from '@app/products/calls/hooks';
import {useCallsAdjustment} from '@calls/hooks';
import CompassIcon from '@components/compass_icon';
import FormattedText from '@components/formatted_text';
import TouchableWithFeedback from '@components/touchable_with_feedback';

12
app/products/calls/hooks.ts
View file

@ -8,12 +8,6 @@ import {useIntl} from 'react-intl';
import {Alert, Platform} from 'react-native';
import Permissions from 'react-native-permissions';
import {
CALL_ERROR_BAR_HEIGHT,
CALL_NOTIFICATION_BAR_HEIGHT,
CURRENT_CALL_BAR_HEIGHT,
JOIN_CALL_BAR_HEIGHT,
} from '@app/constants/view';
import {initializeVoiceTrack} from '@calls/actions/calls';
import {
setMicPermissionsGranted,
@ -24,6 +18,12 @@ import {
useIncomingCalls,
} from '@calls/state';
import {errorAlert} from '@calls/utils';
import {
CALL_ERROR_BAR_HEIGHT,
CALL_NOTIFICATION_BAR_HEIGHT,
CURRENT_CALL_BAR_HEIGHT,
JOIN_CALL_BAR_HEIGHT,
} from '@constants/view';
import {useServerUrl} from '@context/server';
import {useAppState} from '@hooks/device';
import NetworkManager from '@managers/network_manager';

9
app/screens/channel_info/options/auto_follow_threads/auto_follow_threads.tsx
View file

@ -2,7 +2,7 @@
// See LICENSE.txt for license information.
import React, {useState} from 'react';
import {useIntl} from 'react-intl';
import {defineMessage, useIntl} from 'react-intl';
import {updateChannelNotifyProps} from '@actions/remote/channel';
import OptionItem from '@components/option_item';
@ -11,7 +11,6 @@ import {
CHANNEL_AUTO_FOLLOW_THREADS_TRUE,
} from '@constants/channel';
import {useServerUrl} from '@context/server';
import {t} from '@i18n';
import {alertErrorWithFallback} from '@utils/draft';
import {preventDoubleTap} from '@utils/tap';
@ -36,10 +35,10 @@ const AutoFollowThreads = ({channelId, displayName, followedStatus}: Props) => {
alertErrorWithFallback(
intl,
result.error,
{
id: t('channel_info.channel_auto_follow_threads_failed'),
defineMessage({
id: 'channel_info.channel_auto_follow_threads_failed',
defaultMessage: 'An error occurred trying to auto follow all threads in channel {displayName}',
},
}),
{displayName},
);
setAutoFollow((v) => !v);

11
app/screens/channel_info/options/ignore_mentions/ignore_mentions.tsx
View file

@ -2,13 +2,12 @@
// See LICENSE.txt for license information.
import React, {useState} from 'react';
import {useIntl} from 'react-intl';
import {defineMessage, useIntl} from 'react-intl';
import {updateChannelNotifyProps} from '@actions/remote/channel';
import {t} from '@app/i18n';
import {alertErrorWithFallback} from '@app/utils/draft';
import OptionItem from '@components/option_item';
import {useServerUrl} from '@context/server';
import {alertErrorWithFallback} from '@utils/draft';
import {preventDoubleTap} from '@utils/tap';
type Props = {
@ -32,10 +31,10 @@ const IgnoreMentions = ({channelId, ignoring, displayName}: Props) => {
alertErrorWithFallback(
intl,
result.error,
{
id: t('channel_info.channel_auto_follow_threads_failed'),
defineMessage({
id: 'channel_info.channel_auto_follow_threads_failed',
defaultMessage: 'An error occurred trying to auto follow all threads in channel {displayName}',
},
}),
{displayName},
);
setIgnored((v) => !v);

1
assets/base/i18n/en.json
View file

@ -113,6 +113,7 @@
"channel_info.archive_failed": "An error occurred trying to archive the channel {displayName}",
"channel_info.archive_title": "Archive {term}",
"channel_info.channel_auto_follow_threads": "Follow all threads in this channel",
"channel_info.channel_auto_follow_threads_failed": "An error occurred trying to auto follow all threads in channel {displayName}",
"channel_info.channel_files": "Files",
"channel_info.close": "Close",
"channel_info.close_dm": "Close direct message",

12
package-lock.json generated
View file

@ -164,7 +164,7 @@
"jest-cli": "29.6.2",
"jetifier": "2.0.0",
"metro-react-native-babel-preset": "0.77.0",
"mmjstool": "github:mattermost/mattermost-utilities#e65ab00f22628cbdee736fd2e4f192f07225e82d",
"mmjstool": "github:mattermost/mattermost-utilities#83b1b311972b8f5e750aae4019457a40abb5aa44",
"mock-async-storage": "2.2.0",
"nock": "13.3.2",
"patch-package": "8.0.0",
@ -17436,8 +17436,8 @@
},
"node_modules/mmjstool": {
"version": "1.0.0",
"resolved": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#e65ab00f22628cbdee736fd2e4f192f07225e82d",
"integrity": "sha512-tY5XH26LwPztivGSbUWWaxZCkp/cKWTrtWBUnG8L1J+QIcLua8hzyZBe+VGDGdoHUJn4PbGpawJlUyoiC3r9Lg==",
"resolved": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#83b1b311972b8f5e750aae4019457a40abb5aa44",
"integrity": "sha512-SFAbT+eN1mvgSfRTe8k6IMKVWbhGItTJtxZ+Pt0mX+fe8pakB3MkIkWzHBHVnEDI9Ek9kmQFGF1aZwzKFHXyYQ==",
"dev": true,
"dependencies": {
"estree-walk": "^2.2.0",
@ -35806,10 +35806,10 @@
}
},
"mmjstool": {
"version": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#e65ab00f22628cbdee736fd2e4f192f07225e82d",
"integrity": "sha512-tY5XH26LwPztivGSbUWWaxZCkp/cKWTrtWBUnG8L1J+QIcLua8hzyZBe+VGDGdoHUJn4PbGpawJlUyoiC3r9Lg==",
"version": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#83b1b311972b8f5e750aae4019457a40abb5aa44",
"integrity": "sha512-SFAbT+eN1mvgSfRTe8k6IMKVWbhGItTJtxZ+Pt0mX+fe8pakB3MkIkWzHBHVnEDI9Ek9kmQFGF1aZwzKFHXyYQ==",
"dev": true,
"from": "mmjstool@github:mattermost/mattermost-utilities#e65ab00f22628cbdee736fd2e4f192f07225e82d",
"from": "mmjstool@github:mattermost/mattermost-utilities#83b1b311972b8f5e750aae4019457a40abb5aa44",
"requires": {
"estree-walk": "^2.2.0",
"filehound": "^1.17.5",

2
package.json
View file

@ -165,7 +165,7 @@
"jest-cli": "29.6.2",
"jetifier": "2.0.0",
"metro-react-native-babel-preset": "0.77.0",
"mmjstool": "github:mattermost/mattermost-utilities#e65ab00f22628cbdee736fd2e4f192f07225e82d",
"mmjstool": "github:mattermost/mattermost-utilities#83b1b311972b8f5e750aae4019457a40abb5aa44",
"mock-async-storage": "2.2.0",
"nock": "13.3.2",
"patch-package": "8.0.0",