From 57d8ea02374f256715bc071df6385a6786db3432 Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Thu, 22 Apr 2021 14:32:58 +0200
Subject: [PATCH] Add condition for displaying current & separator

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/components/Differ.test.tsx              |  4 ++--
 .../src/components/Differ.tsx                   | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/github-release-manager/src/components/Differ.test.tsx b/plugins/github-release-manager/src/components/Differ.test.tsx
index cb625c4118..b35773f1f5 100644
--- a/plugins/github-release-manager/src/components/Differ.test.tsx
+++ b/plugins/github-release-manager/src/components/Differ.test.tsx
@@ -30,11 +30,11 @@ describe('Differ', () => {
     const { getByTestId, queryByTestId } = render(<Differ icon="branch" />);
 
     const icon = getByTestId(TEST_IDS.components.differ.icons.branch);
-    const current = getByTestId(TEST_IDS.components.differ.current);
+    const current = queryByTestId(TEST_IDS.components.differ.current);
     const next = queryByTestId(TEST_IDS.components.differ.next);
 
     expect(icon).toBeInTheDocument();
-    expect(current.innerHTML).toMatchInlineSnapshot(`"None"`);
+    expect(current).toMatchInlineSnapshot(`null`);
     expect(next).not.toBeInTheDocument();
   });
 
diff --git a/plugins/github-release-manager/src/components/Differ.tsx b/plugins/github-release-manager/src/components/Differ.tsx
index 047b1fbd7e..d4eda688a6 100644
--- a/plugins/github-release-manager/src/components/Differ.tsx
+++ b/plugins/github-release-manager/src/components/Differ.tsx
@@ -40,14 +40,17 @@ export const Differ = ({ current, next, icon }: DifferProps) => {
         </span>
       )}
 
-      <span
-        data-testid={TEST_IDS.components.differ.current}
-        style={{ color: grey[700] }}
-      >
-        {current ?? 'None'}
-      </span>
+      {!!current && (
+        <span
+          data-testid={TEST_IDS.components.differ.current}
+          style={{ color: grey[700] }}
+        >
+          {current ?? 'None'}
+        </span>
+      )}
+
+      {current && next && <span>{'  →  '}</span>}
 
-      {next && <span>{'  →  '}</span>}
       {next && (
         <span
           data-testid={TEST_IDS.components.differ.next}