diff --git a/app/actions/troubleshootingNotification.ts b/app/actions/troubleshootingNotification.ts
index be02f5f6e..5094e928b 100644
--- a/app/actions/troubleshootingNotification.ts
+++ b/app/actions/troubleshootingNotification.ts
@@ -5,11 +5,8 @@ import { ITroubleshootingNotification } from '../reducers/troubleshootingNotific
 
 type TSetTroubleshootingNotification = Action & { payload: Partial<ITroubleshootingNotification> };
 
-type TSetInAlertTroubleshootingNotification = Action & { payload: Pick<ITroubleshootingNotification, 'inAlertNotification'> };
 
-export type TActionTroubleshootingNotification = Action &
-	TSetTroubleshootingNotification &
-	TSetInAlertTroubleshootingNotification;
+export type TActionTroubleshootingNotification = Action & TSetTroubleshootingNotification; 
 
 export function requestTroubleshootingNotification(): Action {
 	return {
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index c2208b469..064a35584 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -743,7 +743,7 @@
   "accept": "Accept",
   "Incoming_call_from": "Incoming call from",
   "Call_started": "Call started",
-  "Message_has_been_shared":"Message has been shared",
+  "Message_has_been_shared": "Message has been shared",
   "No_channels_in_team": "No Channels on this team",
   "Push_Troubleshooting": "Push Troubleshooting",
   "Device_notification_settings": "Device notification settings",
@@ -764,7 +764,7 @@
   "Device_notifications_alert_title": "Notifications disabled",
   "Device_notifications_alert_description": "Please go to your settings app and enable notifications for Rocket.Chat",
   "Push_consumption_alert_title": "You can be limitless",
-  "Push_consumption_alert_description":"Talk to your workspace administrator about upgrading, and forget about notification limits!",
+  "Push_consumption_alert_description": "Talk to your workspace administrator about upgrading, and forget about notification limits!",
   "Jitsi_may_require_authentication": "Jitsi may require authentication",
   "Jitsi_authentication_before_making_calls_admin": "Jitsi may require authentication before making calls. To learn more about their policies, visit the Jitsi website. You can also update the default app for video calls in the preferences.",
   "Jitsi_authentication_before_making_calls": "Jitsi may require authentication before making calls. To learn more about their policies, visit the Jitsi website.",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 14dd53afc..4dd0c7702 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -737,7 +737,7 @@
   "Select": "Selecionar",
   "Nickname": "Apelido",
   "Bio": "Biografia",
-  "Message_has_been_shared":"Mensagem foi compartilhada",
+  "Message_has_been_shared": "Mensagem foi compartilhada",
   "No_channels_in_team": "Nenhum canal nesta equipe",
   "Push_Troubleshooting": "Solucionar Problemas de Push",
   "Device_notification_settings": "Configurações de notificações do dispositivo",
diff --git a/app/views/NotificationPreferencesView/index.tsx b/app/views/NotificationPreferencesView/index.tsx
index 94efb064d..c7bb63e98 100644
--- a/app/views/NotificationPreferencesView/index.tsx
+++ b/app/views/NotificationPreferencesView/index.tsx
@@ -92,7 +92,7 @@ const RenderSwitch = ({ preference, room, onChangeValue }: IBaseParams) => {
 const NotificationPreferencesView = (): React.ReactElement => {
 	const route = useRoute<RouteProp<ChatsStackParamList, 'NotificationPrefView'>>();
 	const { rid, room } = route.params;
-	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'RoomsListView'>>();
+	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'NotificationPrefView'>>();
 	const { serverVersion, isMasterDetail } = useAppSelector(state => ({
 		serverVersion: state.server.version,
 		isMasterDetail: state.app.isMasterDetail