jump to conversation after forwarding (#24172)

* navigate after forward * jump to conversation after forwarding
keybase · May 18, 2020 · be3df66 · be3df66
1 parent 0cf4fdb
commit be3df66
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/shared/actions/chat2-gen.tsx b/shared/actions/chat2-gen.tsx
diff --git a/shared/actions/json/chat2.json b/shared/actions/json/chat2.json
@@ -61,7 +61,8 @@
         "'teamMention'",
         "'appLink'",
         "'search'",
-        "'journeyCardPopular'"
+        "'journeyCardPopular'",
+        "'forward'"
       ]
     },
     "createConversation": {

diff --git a/shared/actions/json/route-tree.json b/shared/actions/json/route-tree.json
@@ -1,7 +1,7 @@
 {
   "prelude": [
-      "import * as Tabs from '../constants/tabs'", 
-      "import * as Types from '../constants/types/route-tree'", 
+      "import * as Tabs from '../constants/tabs'",
+      "import * as Types from '../constants/types/route-tree'",
   ],
   "actions": {
     "navigateAppend": {

diff --git a/shared/chat/conversation/fwd-msg/team-picker.tsx b/shared/chat/conversation/fwd-msg/team-picker.tsx
@@ -5,6 +5,7 @@ import * as Container from '../../../util/container'
 import * as RPCChatTypes from '../../../constants/types/rpc-chat-gen'
 import * as RPCTypes from '../../../constants/types/rpc-gen'
 import * as RouteTreeGen from '../../../actions/route-tree-gen'
+import * as Chat2Gen from '../../../actions/chat2-gen'
 import * as Types from '../../../constants/types/chat2'
 import * as Constants from '../../../constants/chat2'
 import {Avatars, TeamAvatar} from '../../avatars'
@@ -67,6 +68,12 @@ const TeamPicker = (props: Props) => {
       }
     )
     dispatch(RouteTreeGen.createClearModals())
+    dispatch(
+      Chat2Gen.createPreviewConversation({
+        conversationIDKey: Types.conversationIDToKey(dstConvID),
+        reason: 'forward',
+      })
+    )
   }
   React.useEffect(() => {
     doSearch()