Merge branch 'whitelist_players' of https://github.com/1Hive/quests i…

…nto whitelist_players
1Hive · Aug 23, 2023 · 2e7305c · 2e7305c
2 parents 66f2acd + a60c4e3
commit 2e7305c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/react-app/src/components/modals/create-quest-modal.tsx b/packages/react-app/src/components/modals/create-quest-modal.tsx
@@ -236,7 +236,7 @@ export default function QuestModal({
       try {
         let txPayload: TransactionModel = {
           modalId,
-          message: `Creating Quest (2/${values.bounty?.parsedAmount ? '4' : '3'})`,
+          message: `Creating Quest (2/${totalTransactionSteps})`,
           status: TransactionStatus.WaitingForSignature,
           type: TransactionType.QuestCreate,
         };

diff --git a/packages/react-app/src/components/modals/player-list-modal.tsx b/packages/react-app/src/components/modals/player-list-modal.tsx
@@ -134,7 +134,8 @@ export default function PlayerListModal({
                   : 'View Player List'
               }
               mode="strong"
-              title="Player List"
+              title={!isEdit && !players.length ? 'No players' : 'View players'}
+              disabled={!isEdit && !players.length}
             />
           </OpenButtonWrapperStyled>
         }

diff --git a/packages/react-app/src/components/quest.tsx b/packages/react-app/src/components/quest.tsx
@@ -471,12 +471,12 @@ export default function Quest({
                       walletAddress === questData.creatorAddress) && (
                       <PlayerListModal
                         questData={questData}
-                        isEdit={walletAddress === questData.creatorAddress}
+                        isEdit={walletAddress === questData.creatorAddress && questData.isWhitelist}
                       />
                     )}
                     <FundModal quest={questData} />
                     {(((!isPlayingQuest || questData.creatorAddress === walletAddress) &&
-                      questData.isWhitelist) ||
+                      !questData.isWhitelist) ||
                       (waitForClose && transaction?.type === TransactionType.QuestPlay)) &&
                       questData.features?.playableQuest && (
                         <PlayModal