diff --git a/app/actions/actionsTypes.ts b/app/actions/actionsTypes.ts index ae763c1d0..2273e3363 100644 --- a/app/actions/actionsTypes.ts +++ b/app/actions/actionsTypes.ts @@ -30,9 +30,7 @@ export const ROOM = createRequestTypes('ROOM', [ 'FORWARD', 'USER_TYPING', 'HISTORY_REQUEST', - 'HISTORY_FINISHED', - 'FOCUSED_THREAD', - 'REMOVE_FOCUSED_THREAD' + 'HISTORY_FINISHED' ]); export const INQUIRY = createRequestTypes('INQUIRY', [ ...defaultTypes, diff --git a/app/actions/room.ts b/app/actions/room.ts index 11d623eb8..901aeba47 100644 --- a/app/actions/room.ts +++ b/app/actions/room.ts @@ -54,10 +54,6 @@ export interface IRoomHistoryFinished extends Action { loaderId: string; } -export interface IFocusedThreadRoom extends Action { - tmid: string; -} - export type TActionsRoom = TSubscribeRoom & TUnsubscribeRoom & ILeaveRoom & @@ -65,8 +61,7 @@ export type TActionsRoom = TSubscribeRoom & IForwardRoom & IUserTyping & IRoomHistoryRequest & - IRoomHistoryFinished & - IFocusedThreadRoom; + IRoomHistoryFinished; export function subscribeRoom(rid: string): TSubscribeRoom { return { @@ -137,16 +132,3 @@ export function roomHistoryFinished({ loaderId }: { loaderId: string }): IRoomHi loaderId }; } - -export function focusedThreadRoom({ tmid }: { tmid: string }): IFocusedThreadRoom { - return { - type: ROOM.FOCUSED_THREAD, - tmid - }; -} - -export function removeFocusedThreadRoom(): Action { - return { - type: ROOM.REMOVE_FOCUSED_THREAD - }; -} diff --git a/app/lib/methods/subscriptions/room.ts b/app/lib/methods/subscriptions/room.ts index 61baf3b20..d38a84644 100644 --- a/app/lib/methods/subscriptions/room.ts +++ b/app/lib/methods/subscriptions/room.ts @@ -1,7 +1,6 @@ import EJSON from 'ejson'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; import { InteractionManager } from 'react-native'; -import * as Haptics from 'expo-haptics'; import log from '../helpers/log'; import protectedFunction from '../helpers/protectedFunction'; @@ -20,8 +19,6 @@ import { IDDPMessage } from '../../../definitions/IDDPMessage'; import sdk from '../../services/sdk'; import { readMessages } from '../readMessages'; import { loadMissedMessages } from '../loadMissedMessages'; -import userPreferences from '../userPreferences'; -import { NOTIFICATION_IN_APP_VIBRATION } from '../../constants'; const WINDOW_TIME = 1000; @@ -309,18 +306,6 @@ export default class RoomSubscription { } } - // Haptic Feedback when receiving message - const { id: userId } = reduxStore.getState().login.user; - const { focusedThread } = reduxStore.getState().room; - if ( - ((!message.tmid && !message.tlm && !focusedThread) || (message.tmid && message.tmid === focusedThread)) && - message.u._id !== userId - ) { - const notificationInAppVibration = userPreferences.getBool(NOTIFICATION_IN_APP_VIBRATION); - if (notificationInAppVibration || notificationInAppVibration === null) { - Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success); - } - } return resolve(); }); diff --git a/app/reducers/room.test.ts b/app/reducers/room.test.ts index 4d8ad8c24..8d9620e25 100644 --- a/app/reducers/room.test.ts +++ b/app/reducers/room.test.ts @@ -1,9 +1,7 @@ import { deleteRoom, - focusedThreadRoom, forwardRoom, leaveRoom, - removeFocusedThreadRoom, removedRoom, roomHistoryFinished, roomHistoryRequest, @@ -71,17 +69,4 @@ describe('test room reducer', () => { const { historyLoaders } = mockedStore.getState().room; expect(historyLoaders).toEqual([]); }); - - it('should return focusedThread with the tmid properly', () => { - const tmid = 'focusedThread'; - mockedStore.dispatch(focusedThreadRoom({ tmid })); - const { focusedThread } = mockedStore.getState().room; - expect(focusedThread).toEqual(tmid); - }); - - it('should return focusedThread as empty after call removeFocusedThreadRoom', () => { - mockedStore.dispatch(removeFocusedThreadRoom()); - const { focusedThread } = mockedStore.getState().room; - expect(focusedThread).toEqual(''); - }); }); diff --git a/app/reducers/room.ts b/app/reducers/room.ts index 857f9a8f4..c988d8683 100644 --- a/app/reducers/room.ts +++ b/app/reducers/room.ts @@ -8,15 +8,13 @@ export interface IRoom { isDeleting: boolean; subscribedRoom: string; historyLoaders: string[]; - focusedThread: string; } export const initialState: IRoom = { rid: '', isDeleting: false, subscribedRoom: '', - historyLoaders: [], - focusedThread: '' + historyLoaders: [] }; export default function (state = initialState, action: TActionsRoom): IRoom { @@ -70,16 +68,6 @@ export default function (state = initialState, action: TActionsRoom): IRoom { ...state, historyLoaders: state.historyLoaders.filter(loaderId => loaderId !== action.loaderId) }; - case ROOM.FOCUSED_THREAD: - return { - ...state, - focusedThread: action.tmid - }; - case ROOM.REMOVE_FOCUSED_THREAD: - return { - ...state, - focusedThread: '' - }; default: return state; } diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx index 50e589235..6232a32a2 100644 --- a/app/views/RoomView/index.tsx +++ b/app/views/RoomView/index.tsx @@ -95,7 +95,6 @@ import { goRoom, TGoRoomItem } from '../../lib/methods/helpers/goRoom'; import audioPlayer from '../../lib/methods/audioPlayer'; import { IListContainerRef, TListRef } from './List/definitions'; import { getThreadById } from '../../lib/database/services/Thread'; -import { focusedThreadRoom, removeFocusedThreadRoom } from '../../actions/room'; import HapticFeedback from './components/HapticFeedback'; type TStateAttrsUpdate = keyof IRoomViewState; @@ -309,7 +308,7 @@ class RoomView extends React.Component { } componentDidMount() { - const { navigation, dispatch } = this.props; + const { navigation } = this.props; this.mounted = true; this.didMountInteraction = InteractionManager.runAfterInteractions(() => { const { isAuthenticated } = this.props; @@ -340,9 +339,6 @@ class RoomView extends React.Component { this.unsubscribeBlur = navigation.addListener('blur', () => { audioPlayer.pauseCurrentAudio(); }); - if (this.tmid) { - dispatch(focusedThreadRoom({ tmid: this.tmid })); - } } shouldComponentUpdate(nextProps: IRoomViewProps, nextState: IRoomViewState) { @@ -413,7 +409,6 @@ class RoomView extends React.Component { }; async componentWillUnmount() { - const { dispatch } = this.props; const { editing, room } = this.state; const db = database.active; this.mounted = false; @@ -465,9 +460,6 @@ class RoomView extends React.Component { } EventEmitter.removeListener('connected', this.handleConnected); EventEmitter.removeListener('ROOM_REMOVED', this.handleRoomRemoved); - if (this.tmid) { - dispatch(removeFocusedThreadRoom()); - } if (!this.tmid) { // TODO: Refactor when audio becomes global await audioPlayer.unloadRoomAudios(this.rid);