Merge branch 'develop' into pinned

app/actions/actionsTypes.ts

@@ -96,5 +96,6 @@ export const VIDEO_CONF = createRequestTypes('VIDEO_CONF', [
 	'ACCEPT_CALL',
 	'SET_CALLING'
 ]);
+export const TROUBLESHOOTING_NOTIFICATION = createRequestTypes('TROUBLESHOOTING_NOTIFICATION', ['INIT', 'SET']);
 export const SUPPORTED_VERSIONS = createRequestTypes('SUPPORTED_VERSIONS', ['SET']);
 export const IN_APP_FEEDBACK = createRequestTypes('IN_APP_FEEDBACK', ['SET', 'REMOVE', 'CLEAR']);

app/actions/troubleshootingNotification.ts

@@ -0,0 +1,21 @@
+import { Action } from 'redux';
+
+import { TROUBLESHOOTING_NOTIFICATION } from './actionsTypes';
+import { ITroubleshootingNotification } from '../reducers/troubleshootingNotification';
+
+type TSetTroubleshootingNotification = Action & { payload: Partial<ITroubleshootingNotification> };
+
+export type TActionTroubleshootingNotification = Action & TSetTroubleshootingNotification;
+
+export function initTroubleshootingNotification(): Action {
+	return {
+		type: TROUBLESHOOTING_NOTIFICATION.INIT
+	};
+}
+
+export function setTroubleshootingNotification(payload: Partial<ITroubleshootingNotification>): TSetTroubleshootingNotification {
+	return {
+		type: TROUBLESHOOTING_NOTIFICATION.SET,
+		payload
+	};
+}

app/containers/UIKit/VideoConferenceBlock/components/VideoConferenceBaseContainer.tsx

@@ -36,7 +36,7 @@ export const VideoConferenceBaseContainer = ({ variant, children }: VideoConfMes
 		},
 		issue: {
 			icon: 'phone-issue',
-			color: colors.statusFontOnWarning,
+			color: colors.statusFontWarning,
 			backgroundColor: colors.statusBackgroundWarning,
 			label: i18n.t('Call_issue')
 		}

app/definitions/ISubscription.ts

@@ -110,6 +110,7 @@ export interface ISubscription {
 	threads: RelationModified<TThreadModel>;
 	threadMessages: RelationModified<TThreadMessageModel>;
 	uploads: RelationModified<TUploadModel>;
+	disableNotifications?: boolean;
 }
 
 export type TSubscriptionModel = ISubscription &

app/definitions/redux/index.ts

@@ -40,6 +40,8 @@ import { IEnterpriseModules } from '../../reducers/enterpriseModules';
 import { IVideoConf } from '../../reducers/videoConf';
 import { TActionUsersRoles } from '../../actions/usersRoles';
 import { TUsersRoles } from '../../reducers/usersRoles';
+import { ITroubleshootingNotification } from '../../reducers/troubleshootingNotification';
+import { TActionTroubleshootingNotification } from '../../actions/troubleshootingNotification';
 import { ISupportedVersionsState } from '../../reducers/supportedVersions';
 import { IInAppFeedbackState } from '../../reducers/inAppFeedback';
 
@@ -67,6 +69,7 @@ export interface IApplicationState {
 	roles: IRoles;
 	videoConf: IVideoConf;
 	usersRoles: TUsersRoles;
+	troubleshootingNotification: ITroubleshootingNotification;
 	supportedVersions: ISupportedVersionsState;
 	inAppFeedback: IInAppFeedbackState;
 }
@@ -90,5 +93,6 @@ export type TApplicationActions = TActionActiveUsers &
 	TActionEnterpriseModules &
 	TActionVideoConf &
 	TActionUsersRoles &
+	TActionTroubleshootingNotification &
 	TActionSupportedVersions &
 	TInAppFeedbackAction;

app/definitions/rest/v1/index.ts

@@ -17,7 +17,7 @@ import { E2eEndpoints } from './e2e';
 import { SubscriptionsEndpoints } from './subscriptions';
 import { VideoConferenceEndpoints } from './videoConference';
 import { CommandsEndpoints } from './commands';
-import { PushTokenEndpoints } from './pushToken';
+import { PushEndpoints } from './push';
 import { DirectoryEndpoint } from './directory';
 import { AutoTranslateEndpoints } from './autotranslate';
 import { ModerationEndpoints } from './moderation';
@@ -41,7 +41,7 @@ export type Endpoints = ChannelsEndpoints &
 	SubscriptionsEndpoints &
 	VideoConferenceEndpoints &
 	CommandsEndpoints &
-	PushTokenEndpoints &
+	PushEndpoints &
 	DirectoryEndpoint &
 	AutoTranslateEndpoints &
 	ModerationEndpoints;

app/definitions/rest/v1/push.ts

@@ -0,0 +1,24 @@
+type TPushInfo = {
+	pushGatewayEnabled: boolean;
+	defaultPushGateway: boolean;
+	success: boolean;
+};
+
+export type PushEndpoints = {
+	'push.token': {
+		POST: (params: { value: string; type: string; appName: string }) => {
+			result: {
+				id: string;
+				token: string;
+				appName: string;
+				userId: string;
+			};
+		};
+	};
+	'push.info': {
+		GET: () => TPushInfo;
+	};
+	'push.test': {
+		POST: () => { tokensCount: number };
+	};
+};

app/i18n/locales/en.json

@@ -24,6 +24,7 @@
   "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
   "All_users_in_the_team_can_write_new_messages": "All users in the team can write new messages",
   "Allow_Reactions": "Allow reactions",
+  "Allow_push_notifications_for_rocket_chat": "Allow push notifications for Rocket.Chat",
   "Also_send_thread_message_to_channel_behavior": "Also send thread message to channel",
   "Announcement": "Announcement",
   "App_users_are_not_allowed_to_log_in_directly": "App users are not allowed to log in directly.",
@@ -102,6 +103,7 @@
   "Code_block": "Code block",
   "Code_or_password_invalid": "Code or password invalid",
   "Collaborative": "Collaborative",
+  "Community_edition_push_quota": "Community push quota",
   "Condensed": "Condensed",
   "Confirm": "Confirm",
   "Confirmation": "Confirmation",
@@ -134,6 +136,8 @@
   "Create_a_new_workspace": "Create a new workspace",
   "Create_account": "Create an account",
   "Created_snippet": "created a snippet",
+  "Custom_push_gateway_connected_description": "Your workspace uses a custom push notification gateway. Check with your workspace administrator for any issues.",
+  "Custom_push_gateway_connection": "Custom gateway connection",
   "DELETE": "DELETE",
   "Dark": "Dark",
   "Dark_level": "Dark level",
@@ -156,6 +160,9 @@
   "Description": "Description",
   "Desktop_Alert_info": "These notifications are delivered in desktop",
   "Desktop_Notifications": "Desktop notifications",
+  "Device_notification_settings": "Device notification settings",
+  "Device_notifications_alert_description": "Please go to your settings app and enable notifications for Rocket.Chat",
+  "Device_notifications_alert_title": "Notifications disabled",
   "Direct_Messages": "Direct messages",
   "Direct_message": "Direct message",
   "Direct_message_someone": "Direct message someone",
@@ -174,6 +181,7 @@
   "Do_you_have_a_certificate": "Do you have a certificate?",
   "Do_you_have_an_account": "Do you have an account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Do you really want to {{key}} this room?",
+  "Documentation": "Documentation",
   "Dont_Have_An_Account": "Don't you have an account?",
   "Dont_activate": "Don't activate now",
   "Downloaded_file": "Downloaded file",
@@ -387,6 +395,7 @@
   "No_channels_in_team": "No Channels on this team",
   "No_discussions": "No discussions",
   "No_files": "No files",
+  "No_further_action_is_needed": "No further action is needed",
   "No_label_provided": "No {{label}} provided.",
   "No_limit": "No limit",
   "No_match_found": "No match found.",
@@ -404,6 +413,8 @@
   "Nothing": "Nothing",
   "Nothing_to_save": "Nothing to save!",
   "Notification_Preferences": "Notification preferences",
+  "Notification_delay": "Notification delay",
+  "Notification_delay_description": "There are factors that can contribute to delayed notifications. Learn more in Rocket.Chat's docs.",
   "Notifications": "Notifications",
   "Notify_active_in_this_room": "Notify active users in this room",
   "Notify_all_in_this_room": "Notify all in this room",
@@ -461,6 +472,10 @@
   "Public": "Public",
   "Push_Notifications": "Push notifications",
   "Push_Notifications_Alert_Info": "These notifications are delivered to you when the app is not open",
+  "Push_Troubleshooting": "Push Troubleshooting",
+  "Push_gateway_connected_description": "Send a push notification to yourself to check if the gateway is working",
+  "Push_gateway_connection": "Push gateway connection",
+  "Push_gateway_not_connected_description": "We're not able to connect to the push gateway. If this issue persists please check with your workspace administrator.",
   "Queued_chats": "Queued chats",
   "Quote": "Quote",
   "RESET": "RESET",
@@ -605,6 +620,7 @@
   "Team_not_found": "Team not found",
   "Teams": "Teams",
   "Terms_of_Service": " Terms of service ",
+  "Test_push_notification": "Test push notification",
   "The_maximum_number_of_users_has_been_reached": "The maximum number of users has been reached.",
   "The_room_does_not_exist": "The room does not exist or you may not have access permission",
   "The_user_will_be_able_to_type_in_roomName": "The user will be able to type in {{roomName}}",
@@ -625,6 +641,7 @@
   "Token_expired": "Your session has expired. Please log in again.",
   "Topic": "Topic",
   "Translate": "Translate",
+  "Troubleshooting": "Troubleshooting",
   "Try_again": "Try again",
   "Two_Factor_Authentication": "Two-factor authentication",
   "Type_message": "Type message",
@@ -690,6 +707,8 @@
   "Wi_Fi_and_mobile_data": "Wi-Fi and mobile data",
   "Without_Servers": "Without workspaces",
   "Workspace_URL_Example": "Ex. your-company.rocket.chat",
+  "Workspace_consumption": "Workspace consumption",
+  "Workspace_consumption_description": "There’s a set amount of push notifications per month",
   "Workspaces": "Workspaces",
   "Would_like_to_place_on_hold": "Would you like to place this chat on hold?",
   "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?",
@@ -720,6 +739,7 @@
   "Your_invite_link_will_expire_on__date__or_after__usesLeft__uses": "Your invite link will expire on {{date}} or after {{usesLeft}} uses.",
   "Your_invite_link_will_never_expire": "Your invite link will never expire.",
   "Your_password_is": "Your password is",
+  "Your_push_was_sent_to_s_devices": "Your push was sent to {{s}} devices",
   "Your_workspace": "Your workspace",
   "__count__empty_room_will_be_removed_automatically": "{{count}} empty room will be deleted.",
   "__count__empty_rooms_will_be_removed_automatically": "{{count}} empty rooms will be deleted.",
@@ -761,6 +781,7 @@
   "error-invalid-file-type": "Invalid file type",
   "error-invalid-password": "Invalid password",
   "error-invalid-room-name": "{{room_name}} is not a valid room name",
+  "error-no-tokens-for-this-user": "There are no tokens for this user",
   "error-not-allowed": "Not allowed",
   "error-not-permission-to-upload-file": "You don't have permission to upload files",
   "error-save-image": "Error while saving image",

app/i18n/locales/pt-BR.json

@@ -23,6 +23,7 @@
   "All_users_in_the_channel_can_write_new_messages": "Todos usuários no canal podem enviar mensagens novas",
   "All_users_in_the_team_can_write_new_messages": "Todos usuários no canal podem enviar mensagens novas",
   "Allow_Reactions": "Permitir reagir",
+  "Allow_push_notifications_for_rocket_chat": "Permitir notificações push para Rocket.Chat",
   "Also_send_thread_message_to_channel_behavior": "Também enviar mensagem do tópico para o canal",
   "Announcement": "Anúncio",
   "App_users_are_not_allowed_to_log_in_directly": "Usuários do aplicativo não estão autorizados a fazer login diretamente.",
@@ -55,7 +56,7 @@
   "Call_issue": "Chamada com problemas",
   "Call_ongoing": "Chamada em andamento",
   "Call_rejected": "Chamada rejeitada",
-  "Call_started": "Chamada iniciada",
+  "Call_started": "Chamada Iniciada",
   "Call_was_not_answered": "A chamada não foi atendida",
   "Calling": "Chamando",
   "Cancel": "Cancelar",
@@ -99,6 +100,7 @@
   "Close_emoji_selector": "Fechar seletor de emojis",
   "Code_or_password_invalid": "Código ou senha inválido",
   "Collaborative": "Colaborativo",
+  "Community_edition_push_quota": "Cota de notificações push community edition",
   "Condensed": "Condensado",
   "Confirm": "Confirmar",
   "Confirmation": "Confirmação",
@@ -131,6 +133,8 @@
   "Create_a_new_workspace": "Criar nova área de trabalho",
   "Create_account": "Criar conta",
   "Created_snippet": "criou um snippet",
+  "Custom_push_gateway_connected_description": "Seu workspace utiliza um gateway de notificação push personalizado. Verifique com o administrador do seu workspace se há algum problema.",
+  "Custom_push_gateway_connection": "Conexão personalizada com o gateway",
   "DELETE": "EXCLUIR",
   "Dark": "Escuro",
   "Dark_level": "Nível escuro",
@@ -153,6 +157,9 @@
   "Description": "Descrição",
   "Desktop_Alert_info": "Essas notificações são entregues a você na área de trabalho",
   "Desktop_Notifications": "Notificações da área de trabalho",
+  "Device_notification_settings": "Configurações de notificações do dispositivo",
+  "Device_notifications_alert_description": "Por favor, vá para o aplicativo de configurações e habilite as notificações para o Rocket.Chat.",
+  "Device_notifications_alert_title": "Notificações desativadas",
   "Direct_Messages": "Mensagens diretas",
   "Direct_message": "Mensagem direta",
   "Direct_message_someone": "Enviar mensagem direta para alguém",
@@ -171,6 +178,7 @@
   "Do_you_have_a_certificate": "Você tem um certificado?",
   "Do_you_have_an_account": "Você tem uma conta?",
   "Do_you_really_want_to_key_this_room_question_mark": "Você quer realmente {{key}} esta sala?",
+  "Documentation": "Documentação",
   "Dont_Have_An_Account": "Não tem uma conta?",
   "Dont_activate": "Não ativar agora",
   "Downloaded_file": "Arquivo baixado",
@@ -267,6 +275,7 @@
   "Jitsi_authentication_before_making_calls_admin": "Jitsi pode exigir autenticação antes de fazer chamadas. Para saber mais sobre as políticas deles, visite o site do Jitsi. Você também pode atualizar o aplicativo padrão para chamadas de vídeo nas preferências.",
   "Jitsi_authentication_before_making_calls_ask_admin": "Se você acredita que há problemas com o Jitsi e sua autenticação, peça ajuda a um administrador do espaço de trabalho.",
   "Jitsi_may_require_authentication": "O Jitsi pode exigir autenticação",
+  "Jitsi_may_requires_authentication": "Jitsi pode exigir autenticação",
   "Join": "Entrar",
   "Join_Code": "Insira o código da sala",
   "Join_our_open_workspace": "Entrar na nossa workspace pública",
@@ -381,6 +390,7 @@
   "No_channels_in_team": "Nenhum canal nesta equipe",
   "No_discussions": "Sem discussões",
   "No_files": "Não há arquivos",
+  "No_further_action_is_needed": "Nenhuma ação adicional é necessária",
   "No_label_provided": "Sem {{label}}.",
   "No_limit": "Sem limite",
   "No_match_found": "Nenhum resultado encontrado.",
@@ -397,6 +407,8 @@
   "Nothing": "Nada",
   "Nothing_to_save": "Nada para salvar!",
   "Notification_Preferences": "Preferências de notificação",
+  "Notification_delay": "Atraso de notificação",
+  "Notification_delay_description": "Existem fatores que podem contribuir para atrasos nas notificações. Saiba mais na documentação do Rocket.Chat.",
   "Notifications": "Notificações",
   "Notify_active_in_this_room": "Notificar usuários ativos nesta sala",
   "Notify_all_in_this_room": "Notificar todos nesta sala",
@@ -452,6 +464,10 @@
   "Public": "Público",
   "Push_Notifications": "Notificações push",
   "Push_Notifications_Alert_Info": "Essas notificações são entregues a você quando o aplicativo não está aberto",
+  "Push_Troubleshooting": "Solucionar Problemas de Push",
+  "Push_gateway_connected_description": "Envie uma notificação push para si mesmo para verificar se o gateway está funcionando.",
+  "Push_gateway_connection": "Conexão com o gateway de push",
+  "Push_gateway_not_connected_description": "Não conseguimos conectar ao gateway de push. Se esse problema persistir, por favor, verifique com o administrador do seu workspace.",
   "Queued_chats": "Bate-papos na fila",
   "Quote": "Citar",
   "RESET": "RESETAR",
@@ -593,6 +609,7 @@
   "Team_not_found": "Time não encontrado",
   "Teams": "Times",
   "Terms_of_Service": " Termos de serviço ",
+  "Test_push_notification": "Testar notificação push",
   "The_maximum_number_of_users_has_been_reached": "O número máximo de usuários foi atingido.",
   "The_room_does_not_exist": "A sala não existe ou você pode não ter permissão de acesso",
   "The_user_will_be_able_to_type_in_roomName": "O usuário poderá digitar em {{roomName}}",
@@ -678,6 +695,8 @@
   "Wi_Fi_and_mobile_data": "Wi-Fi e dados móveis",
   "Without_Servers": "Sem workspaces",
   "Workspace_URL_Example": "Ex. sua-empresa.rocket.chat",
+  "Workspace_consumption": "Consumo do workspace",
+  "Workspace_consumption_description": "Existe uma quantidade definida de notificações push por mês",
   "Workspaces": "Workspaces",
   "Would_like_to_place_on_hold": "Gostaria de colocar essa conversa em espera?",
   "Would_you_like_to_return_the_inquiry": "Deseja retornar a consulta?",
@@ -708,6 +727,7 @@
   "Your_invite_link_will_expire_on__date__or_after__usesLeft__uses": "Seu link de convite irá vencer em {{date}} ou depois de {{usesLeft}} usos.",
   "Your_invite_link_will_never_expire": "Seu link de convite nunca irá vencer.",
   "Your_password_is": "Sua senha é",
+  "Your_push_was_sent_to_s_devices": "A sua notificação foi enviada para {{s}} dispositivos",
   "Your_workspace": "Sua workspace",
   "__count__empty_room_will_be_removed_automatically": "{{count}} sala vazia será excluída.",
   "__count__empty_rooms_will_be_removed_automatically": "{{count}} salas vazias serão excluídas.",
@@ -749,6 +769,7 @@
   "error-invalid-file-type": "Tipo de arquivo inválido",
   "error-invalid-password": "Senha inválida",
   "error-invalid-room-name": "{{room_name}} não é um nome de sala válido",
+  "error-no-tokens-for-this-user": "Não existem tokens para este usuário",
   "error-not-allowed": "Não permitido",
   "error-not-permission-to-upload-file": "Você não tem permissão para enviar arquivos",
   "error-save-image": "Erro ao salvar imagem",

app/lib/constants/colors.ts

@@ -287,7 +287,6 @@ export const colors = {
 		gray100: '#CBCED1',
 		n900: '#1F2329',
 		statusBackgroundWarning: '#FFECAD',
-		statusFontOnWarning: '#B88D00',
 		overlayColor: '#1F2329CC',
 		taskBoxColor: '#9297a2',
 		...mentions,
@@ -369,7 +368,6 @@ export const colors = {
 		gray100: '#CBCED1',
 		n900: '#FFFFFF',
 		statusBackgroundWarning: '#FFECAD',
-		statusFontOnWarning: '#B88D00',
 		overlayColor: '#1F2329CC',
 		taskBoxColor: '#9297a2',
 		...mentions,
@@ -451,7 +449,6 @@ export const colors = {
 		gray100: '#CBCED1',
 		n900: '#FFFFFF',
 		statusBackgroundWarning: '#FFECAD',
-		statusFontOnWarning: '#B88D00',
 		overlayColor: '#1F2329CC',
 		taskBoxColor: '#9297a2',
 		...mentions,