fix: merge conflicts resolved

makeplane · May 8, 2024 · d98bfe7 · d98bfe7
2 parents 9024fd8 + ae43d05
commit d98bfe7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/web/components/issues/issue-layouts/list/block.tsx b/web/components/issues/issue-layouts/list/block.tsx
@@ -93,12 +93,16 @@ export const IssueBlock: React.FC<IssueBlockProps> = observer((props: IssueBlock
       <div className="flex w-full truncate" style={issue.parent_id && nestingLevel !== 0 ? { paddingLeft } : {}}>
         <div className="flex flex-grow items-center gap-3 truncate">
           <div className="flex items-center gap-1.5">
-            <button
-              className="flex items-center justify-center h-5 w-5 cursor-pointer rounded-sm text-custom-text-400  hover:text-custom-text-300"
-              onClick={handleToggleExpand}
-            >
-              <ChevronRight className={`h-4 w-4 ${isExpanded ? "rotate-90" : ""}`} />
-            </button>
+            <div className="flex h-5 w-5 items-center justify-center">
+              {issue.sub_issues_count > 0 && (
+                <button
+                  className="flex items-center justify-center h-5 w-5 cursor-pointer rounded-sm text-custom-text-400  hover:text-custom-text-300"
+                  onClick={handleToggleExpand}
+                >
+                  <ChevronRight className={`h-4 w-4 ${isExpanded ? "rotate-90" : ""}`} />
+                </button>
+              )}
+            </div>
             {displayProperties && displayProperties?.key && (
               <div className="flex-shrink-0 text-xs font-medium text-custom-text-300">
                 {projectIdentifier}-{issue.sequence_id}

diff --git a/web/package.json b/web/package.json
@@ -48,7 +48,7 @@
     "next-pwa": "^5.6.0",
     "next-themes": "^0.2.1",
     "nprogress": "^0.2.0",
-    "posthog-js": "^1.105.0",
+    "posthog-js": "^1.131.3",
     "react": "^18.3.1",
     "react-color": "^2.19.3",
     "react-day-picker": "^8.10.0",