Merge remote-tracking branch 'origin/release-020226'

Author: Cl0v1s

.husky/commit-msg

@@ -1 +1 @@
-./node_modules/.bin/commitlint --edit "$1"
+./node_modules/.bin/commitlint --edit "$1"

app/soapbox/__fixtures__/intlMessages.json

@@ -60,7 +60,7 @@
     "bundle_modal_error.retry": "Try again",
     "column.blocks": "Blocked users",
     "column.community": "Local timeline",
-    "column.direct": "Direct messages",
+    "column.direct": "Conversations",
     "column.domain_blocks": "Hidden domains",
     "column.edit_profile": "Edit profile",
     "column.filters": "Muted words",
@@ -538,7 +538,7 @@
   "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.direct": "Conversations",
   "column.domain_blocks": "Hidden domains",
   "column.edit_profile": "Edit profile",
   "column.filters": "Muted words",

app/soapbox/actions/chats.ts

@@ -212,26 +212,25 @@ const mentionCompose = (account: Account) =>
     dispatch(openModal('COMPOSE'));
   };
 
-const directCompose = (account: Account) =>
+const directCompose = (history: History, account: Account) =>
   (dispatch: AppDispatch) => {
+    dispatch(resetCompose());
     dispatch({
       type: COMPOSE_DIRECT,
       account: account,
     });
-
-    dispatch(openModal('COMPOSE'));
+    history.push('/statuses/compose');
   };
 
-const directComposeById = (accountId: string) =>
+const directComposeById = (history: History, accountId: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const account = getState().accounts.get(accountId);
-
+    dispatch(resetCompose());
     dispatch({
       type: COMPOSE_DIRECT,
       account: account,
     });
-
-    dispatch(openModal('COMPOSE'));
+    history.push('/statuses/compose');
   };
 
 const handleComposeSubmit = (dispatch: AppDispatch, getState: () => RootState, data: APIEntity, status: string, edit?: boolean) => {

app/soapbox/actions/compose.ts

@@ -204,9 +204,6 @@ const expandRemoteTimeline = (instance: string, { maxId, onlyMedia, excludeRepli
 const expandCommunityTimeline = ({ maxId, onlyMedia, excludeReplies }: Record<string, any> = {}, done = noOp) =>
   expandTimeline(`community${onlyMedia ? ':media' : ''}${excludeReplies ? ':exclude_replies' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia, exclude_replies: excludeReplies }, done);
 
-const expandDirectTimeline = ({ maxId }: Record<string, any> = {}, done = noOp) =>
-  expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId }, done);
-
 const expandAccountTimeline = (accountId: string, { maxId, withReplies }: Record<string, any> = {}) =>
   expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, max_id: maxId, with_muted: true });
 
@@ -307,7 +304,6 @@ export {
   expandPublicTimeline,
   expandRemoteTimeline,
   expandCommunityTimeline,
-  expandDirectTimeline,
   expandAccountTimeline,
   expandAccountFeaturedTimeline,
   expandAccountMediaTimeline,

app/soapbox/actions/timelines.ts

@@ -9,10 +9,9 @@ FaviconService.initFaviconService();
 
 const getNotifTotals = (state: RootState): number => {
   const notifications = state.notifications.unread || 0;
-  const chats = state.chats.items.reduce((acc: any, curr: any) => acc + Math.min(curr.get('unread', 0), 1), 0);
   const reports = state.admin.openReports.count();
   const approvals = state.admin.awaitingApproval.count();
-  return notifications + chats + reports + approvals;
+  return notifications + reports + approvals;
 };
 
 const Helmet: React.FC = ({ children }) => {