From d029a390fa9b5b454e477b6d761881730bcb68f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Thu, 11 Aug 2022 21:24:33 +0200
Subject: [PATCH] Fixing create-board from board selector in desktop app
 (#3657)

---
 webapp/src/components/workspace.tsx | 40 +++++++++++++++++------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/webapp/src/components/workspace.tsx b/webapp/src/components/workspace.tsx
index e84eb7eb3..812250471 100644
--- a/webapp/src/components/workspace.tsx
+++ b/webapp/src/components/workspace.tsx
@@ -85,6 +85,28 @@ function CenterContent(props: Props) {
         }
     }, [cardLimitTimestamp, match.params.boardId, templates])
 
+    const templateSelector = (
+        <BoardTemplateSelector
+            title={
+                <FormattedMessage
+                    id='BoardTemplateSelector.plugin.no-content-title'
+                    defaultMessage='Create a board'
+                />
+            }
+            description={
+                <FormattedMessage
+                    id='BoardTemplateSelector.plugin.no-content-description'
+                    defaultMessage='Add a board to the sidebar using any of the templates defined below or start from scratch.'
+                />
+            }
+            channelId={match.params.channelId}
+        />
+    )
+
+    if (match.params.channelId) {
+        return templateSelector
+    }
+
     if (board && !isBoardHidden() && activeView) {
         let property = groupByProperty
         if ((!property || property.type !== 'select') && activeView.fields.viewType === 'board') {
@@ -117,23 +139,7 @@ function CenterContent(props: Props) {
         return null
     }
 
-    return (
-        <BoardTemplateSelector
-            title={
-                <FormattedMessage
-                    id='BoardTemplateSelector.plugin.no-content-title'
-                    defaultMessage='Create a board'
-                />
-            }
-            description={
-                <FormattedMessage
-                    id='BoardTemplateSelector.plugin.no-content-description'
-                    defaultMessage='Add a board to the sidebar using any of the templates defined below or start from scratch.'
-                />
-            }
-            channelId={match.params.channelId}
-        />
-    )
+    return templateSelector
 }
 
 const Workspace = (props: Props) => {