From e3e9c43ba4fa764b7aa898f85dd9aaf9dc587d9f Mon Sep 17 00:00:00 2001
From: wilson <wh.dev@icloud.com>
Date: Mon, 14 Mar 2022 17:24:52 -0400
Subject: [PATCH 1/2] fix: #514 hide DM entry button when user joined a
 campaign with a character

---
 .../CampaignDetail/CampaignDetailBox.tsx      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx b/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
index 6e49f695e..e6fe47f53 100644
--- a/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
+++ b/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
@@ -100,16 +100,18 @@ const CampaignDetailBox = ({
                                     </Button>
                                 </Link>
                             )}
-                            <Link
-                                href={route('dm-entry.create').concat(
-                                    `?campaign_id=${campaign.id}`,
-                                )}>
-                                <Button
-                                    variant='contained'
-                                    startIcon={<AutoStoriesIcon fontSize='small' />}>
-                                    {t('common.dm-entry')}
-                                </Button>
-                            </Link>
+                            {!userCharacter && (
+                                <Link
+                                    href={route('dm-entry.create').concat(
+                                        `?campaign_id=${campaign.id}`,
+                                    )}>
+                                    <Button
+                                        variant='contained'
+                                        startIcon={<AutoStoriesIcon fontSize='small' />}>
+                                        {t('common.dm-entry')}
+                                    </Button>
+                                </Link>
+                            )}
                             <Button
                                 data-cy='kick-button'
                                 variant='contained'

From 1eb2668a997862ff4d70b62382630c4a42868a0c Mon Sep 17 00:00:00 2001
From: wilson <wh.dev@icloud.com>
Date: Mon, 14 Mar 2022 18:02:23 -0400
Subject: [PATCH 2/2] refactor: use ternary expression

---
 .../Components/Detail/CampaignDetail/CampaignDetailBox.tsx   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx b/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
index e6fe47f53..77052789e 100644
--- a/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
+++ b/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
@@ -88,7 +88,7 @@ const CampaignDetailBox = ({
                                 onClick={() => setIsEditDrawerOpen(true)}>
                                 {t('common.update')}
                             </Button>
-                            {userCharacter && (
+                            {userCharacter ? (
                                 <Link
                                     href={route('entry.create').concat(
                                         `?character_id=${userCharacter.id}&campaign_id=${campaign.id}`,
@@ -99,8 +99,7 @@ const CampaignDetailBox = ({
                                         {t('common.entry')}
                                     </Button>
                                 </Link>
-                            )}
-                            {!userCharacter && (
+                            ) : (
                                 <Link
                                     href={route('dm-entry.create').concat(
                                         `?campaign_id=${campaign.id}`,