#1786 :: fix

Betarena · Oct 19, 2023 · 8a31d97 · 8a31d97
1 parent 7bf4370
commit 8a31d97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
@@ -78,7 +78,9 @@
     /** @description competition (main) | imposed geo-location restriction */
     geoLocationRestrictions: string[],
     /** @description competition (main) | `native` status */
-    competitionStatus: B_C_COMP_DATA_Status
+    competitionStatus: B_C_COMP_DATA_Status,
+    /** @description competition showModal */
+    showModal: boolean = false
   ;
 
   const
@@ -136,6 +138,7 @@
     if (!browser) return;
 
     $sessionStore.isShowFixtureCompetitionJoinModal = false;
+    showModal = false;
 
     // ▓▓ [🐞]
     // alert('Joining Competition');
@@ -214,13 +217,14 @@
 <!--
 ▓▓ Cast vote modal
 -->
-{#if $sessionStore.isShowFixtureCompetitionJoinModal}
+{#if $sessionStore.isShowFixtureCompetitionJoinModal && showModal}
   <CompModalMultiple
     {isViewMobile}
     {isViewTablet}
     balanceDeductAmount={entryFee}
+    targetVote={viewType}
     {geoLocationRestrictions}
-    on:closeModal={() => $sessionStore.isShowFixtureCompetitionJoinModal = false}
+    on:closeModal={() => { $sessionStore.isShowFixtureCompetitionJoinModal = false; showModal = false; }}
     on:confirmEntry={() => joinCompetition()}
   />
 {/if}
@@ -269,7 +273,7 @@
           w-500
           btn-primary-v2
           "
-          on:click={() => $sessionStore.isShowFixtureCompetitionJoinModal = true}
+          on:click={() => { $sessionStore.isShowFixtureCompetitionJoinModal = true; showModal = true; }}
           class:disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
           class:color-grey={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
           disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}

diff --git a/src/lib/components/shared/COMP-Modal-Multiple.svelte b/src/lib/components/shared/COMP-Modal-Multiple.svelte
@@ -29,6 +29,8 @@
 	import sessionStore from '$lib/store/session.js';
 	import userBetarenaSettings from '$lib/store/user-settings.js';
 
+	import type { B_C_COMP_DATA_Prediction_Group } from '@betarena/scores-lib/types/_HASURA_.js';
+
   // #endregion ➤ 📦 Package Imports
 
   // #region ➤ 📌 VARIABLES
@@ -47,7 +49,9 @@
     /** @description competition (main) | amount entry fee */
     balanceDeductAmount: number,
     /** @description competition (main) | imposed geo-location restriction */
-    geoLocationRestrictions: string[]
+    geoLocationRestrictions: string[],
+    /** @description target casted vote on competition by user */
+    targetVote: B_C_COMP_DATA_Prediction_Group
   ;
 
 	const
@@ -219,7 +223,7 @@ MODAL - DYNAMIC
       color-black-2
       "
     >
-      Confirm that you wish to Join Yes and be charged for
+      Confirm that you wish to Join <span class="capitalize">{targetVote}</span> and be charged for
       <span class="color-primary">{balanceDeductAmount} BTA</span> from your current balance.
     </p>