From c49492a34904b62987f35a9ceb830e03f1a730a6 Mon Sep 17 00:00:00 2001
From: Ivan Izobov <54995954+Izobov@users.noreply.github.com>
Date: Wed, 16 Oct 2024 20:07:26 +0300
Subject: [PATCH 1/4] to-prod |:| optimonk and public presale redirect (#2280)

* Core/redirect to presale/draft/0 (#2278)

* dev: redirect to public presale

* add: buy botton redirect

* dev: buy button redirect

* add: optimonk (#2279)
---
 src/app.html                                  |  9 ++++++-
 .../main/Main-Modal-Multiple.svelte           |  5 ++--
 .../page/profile/Widget-MenuOpt-Row.svelte    | 27 +++++++++++--------
 .../page/profile/Widget-MenuOpt.svelte        | 18 ++++++++++---
 .../shared/BuyBta/Buy-BTA-Button.svelte       | 10 ++-----
 .../shared/BuyBta/Buy-BTA-popup.svelte        |  7 +++--
 6 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/app.html b/src/app.html
index 3c8a03212..198031a50 100644
--- a/src/app.html
+++ b/src/app.html
@@ -48,6 +48,7 @@
       href="/app.css"
     />
 
+
     <!--
     ▓ NOTE:
     ▓ > Declare all CSS 'all-in-one-css-file.css'.
@@ -14741,8 +14742,14 @@
       gtag('js', new Date());
       gtag('config', 'G-LDMRQC7B7Z');
     </script>
+     <!--
+    ╭──────────────────────────────────────────────────────────────────────────────────╮
+    │ 3rd-Party JS Snippet | optimonk                                      │
+    ╰──────────────────────────────────────────────────────────────────────────────────╯
+    -->
+    <script type="text/javascript" src="https://onsite.optimonk.com/script.js?account=240954" async></script>
 
-		%sveltekit.head%
+    %sveltekit.head%
 	</head>
 
   <!--
diff --git a/src/lib/components/page/competition/main/Main-Modal-Multiple.svelte b/src/lib/components/page/competition/main/Main-Modal-Multiple.svelte
index b75f8e1e3..fdf254baf 100644
--- a/src/lib/components/page/competition/main/Main-Modal-Multiple.svelte
+++ b/src/lib/components/page/competition/main/Main-Modal-Multiple.svelte
@@ -276,8 +276,9 @@ MODAL - DYNAMIC
         </button>
 
         <a
-          href="/u/deposit/{$userBetarenaSettings.lang}"
-          title='Go to Deposit Page'
+          href="https://betarena.com/public-presale"
+          target="_blank"
+          title='Go to Presale Page'
         >
           <button
             on:click={() => closeModal()}
diff --git a/src/lib/components/page/profile/Widget-MenuOpt-Row.svelte b/src/lib/components/page/profile/Widget-MenuOpt-Row.svelte
index e10b2bb6e..b9cad8d77 100644
--- a/src/lib/components/page/profile/Widget-MenuOpt-Row.svelte
+++ b/src/lib/components/page/profile/Widget-MenuOpt-Row.svelte
@@ -117,7 +117,7 @@ COMPONENT JS (w/ TS)
 	): void
 	{
 	  const if_M_0: boolean
-      = ['Scores', 'Author'].includes(MENU_OPT)
+      = ['Scores', 'Author', "Withdraw"].includes(MENU_OPT)
     ;
 	  if (if_M_0) return;
 
@@ -193,11 +193,14 @@ COMPONENT JS (w/ TS)
   }
   else if (MENU_OPT == 'Withdraw')
   {
-    hoverMenuOptIconAlt = icon_withdraw_select;
-    selectedMenuOptIcon
-      = SELECTED_OPT == MENU_OPT
-        ? icon_withdraw_select
-        : icon_withdraw
+
+    hoverMenuOptIconAlt = icon_withdraw;
+    selectedMenuOptIcon = icon_withdraw;
+    // hoverMenuOptIconAlt = icon_withdraw_select;
+    // selectedMenuOptIcon
+    //   = SELECTED_OPT == MENU_OPT
+    //     ? icon_withdraw_select
+    //     : icon_withdraw
     ;
   }
   else if (MENU_OPT == 'Transaction History')
@@ -340,7 +343,8 @@ VIEW DESIGN - 2
       !
       [
         'Scores'
-        ,'Author'
+        ,'Author',
+        "Withdraw"
       ]
         .includes(MENU_OPT)
     }
@@ -348,7 +352,8 @@ VIEW DESIGN - 2
     {
       [
         'Scores'
-        ,'Author'
+        ,'Author',
+        "Withdraw"
       ]
         .includes(MENU_OPT)
     }
@@ -378,7 +383,7 @@ VIEW DESIGN - 2
 			<img
 				src=
         {
-          (!isHoverMenuOptItem || ['Scores', 'Author'].includes(MENU_OPT))
+          (!isHoverMenuOptItem || ['Scores', 'Author', "Withdraw"].includes(MENU_OPT))
             ? selectedMenuOptIcon
             : hoverMenuOptIconAlt
         }
@@ -408,7 +413,7 @@ VIEW DESIGN - 2
         {
           [
             'Scores'
-            ,'Author'
+            ,'Author', "Withdraw"
 				  ].includes(MENU_OPT)
         }
 				class:menu-opt-text=
@@ -416,7 +421,7 @@ VIEW DESIGN - 2
           !
           [
             'Scores'
-            ,'Author'
+            ,'Author', "Withdraw"
           ].includes(MENU_OPT)
         }
 			>
diff --git a/src/lib/components/page/profile/Widget-MenuOpt.svelte b/src/lib/components/page/profile/Widget-MenuOpt.svelte
index b09bbbdf5..cbb810e9b 100644
--- a/src/lib/components/page/profile/Widget-MenuOpt.svelte
+++ b/src/lib/components/page/profile/Widget-MenuOpt.svelte
@@ -85,9 +85,13 @@ COMPONENT JS (w/ TS)
 		if (selectedMenuOpt == 'Investor')
       targetUrl = `/u/investor/${$userBetarenaSettings.lang}`
     ;
-    if (selectedMenuOpt == 'Deposit')
-      targetUrl = `/u/deposit/${$userBetarenaSettings.lang}`
-    ;
+    if (selectedMenuOpt == "Deposit") {
+      if (browser) {
+        window.open(`https://betarena.com/public-presale`, "_blank");
+      }
+      selectedMenuOpt = "Dashboard";
+      targetUrl = `/u/dashboard/${$userBetarenaSettings.lang}`;
+    }
     if (selectedMenuOpt == 'Transaction History')
       targetUrl = `/u/transaction-history/${$userBetarenaSettings.lang}`
     ;
@@ -145,6 +149,14 @@ COMPONENT JS (w/ TS)
         selectedMenuOpt = 'Investor';
         break;
       case 'deposit':
+      case 'deposit':
+          goto
+        (
+          `/u/dashboard/${$userBetarenaSettings.lang}`,
+          {
+            replaceState: true
+          }
+        );
         selectedMenuOpt = 'Deposit';
         break;
       case 'transaction-history':
diff --git a/src/lib/components/shared/BuyBta/Buy-BTA-Button.svelte b/src/lib/components/shared/BuyBta/Buy-BTA-Button.svelte
index e3ae7fadb..291c1a528 100644
--- a/src/lib/components/shared/BuyBta/Buy-BTA-Button.svelte
+++ b/src/lib/components/shared/BuyBta/Buy-BTA-Button.svelte
@@ -27,8 +27,6 @@
   import type { B_NAV_T } from "@betarena/scores-lib/types/navbar.js";
   import Button from "$lib/components/ui/Button.svelte";
   import { createEventDispatcher, onMount } from "svelte";
-  import { modalStore } from "$lib/store/modal.js";
-  import BuyBtaPopup from "./Buy-BTA-popup.svelte";
   import { get } from "$lib/api/utils.js";
   import buyOptionsTranslations from "./store"
   import sessionStore  from "$lib/store/session.js";
@@ -74,12 +72,8 @@
 
   function click() {
     dispatch("click");
-    if (popup) {
-      modalStore.update((s) => ({
-        show: true,
-        modal: true,
-        component: BuyBtaPopup as any,
-      }));
+    if (popup && browser) {
+      window.open("https://betarena.com/public-presale", "_blank");
     }
   }
 
diff --git a/src/lib/components/shared/BuyBta/Buy-BTA-popup.svelte b/src/lib/components/shared/BuyBta/Buy-BTA-popup.svelte
index 1a63c640e..c738412a9 100644
--- a/src/lib/components/shared/BuyBta/Buy-BTA-popup.svelte
+++ b/src/lib/components/shared/BuyBta/Buy-BTA-popup.svelte
@@ -45,16 +45,19 @@
   // │ 4. $: [..]                                                             │
   // ╰────────────────────────────────────────────────────────────────────────╯
   $: data = $buyOptionsTranslations;
+  $: console.log("DATA: ", data)
   $: options = [
     {
       name: data.competitions || "Competitions",
       description: data.info_competitions || "Get tokens to participate",
       link: data.link_competitions || "/competitions",
+      target: "_self",
     },
     {
       name: data.presale || "Presale",
       description: data.info_presale || "Invest on BTA token presale",
-      link: data.link_presale || `/u/investor/${$userBetarenaSettings.lang}`,
+      link: "https://betarena.com/public-presale",
+      target: "_blank",
     },
   ];
 
@@ -80,7 +83,7 @@
   on:click={() => ($modalStore.show = false)}
 >
   {#each options as option, i}
-    <a href={option.link} class="option" title={option.description}>
+    <a href={option.link} target={option.target} class="option" title={option.description}>
       <div class="label">
         <span class="name">{option.name}</span>
         <span class="description">{option.description}</span>

From baa4ca143463a5e13be880b9e7e62f99f1f327ed Mon Sep 17 00:00:00 2001
From: migbash <20924663+migbash@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:07:52 +0000
Subject: [PATCH 2/4] 2.15.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 972bee3bf..1aece9eb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "betarena-scores-platform",
-	"version": "2.15.1",
+	"version": "2.15.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "betarena-scores-platform",
-			"version": "2.15.1",
+			"version": "2.15.2",
 			"license": "ISC",
 			"dependencies": {
 				"@betarena/ad-engine": "0.0.51",
diff --git a/package.json b/package.json
index 978863c55..6502a892d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "betarena-scores-platform",
-	"version": "2.15.1",
+	"version": "2.15.2",
 	"description": "Betarena Official Scores Platform (PWA)",
 	"author": "migbash",
 	"license": "ISC",

From 538a6b68b4e15fb1fc86d3b5a61e1e748d92c9d6 Mon Sep 17 00:00:00 2001
From: Ivan Izobov <54995954+Izobov@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:22:21 +0300
Subject: [PATCH 3/4] dev: public presale link (#2284) (#2285)

---
 .../profile/investor/Main-Investor-Title.svelte    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/page/profile/investor/Main-Investor-Title.svelte b/src/lib/components/page/profile/investor/Main-Investor-Title.svelte
index 9098536b9..25f062952 100644
--- a/src/lib/components/page/profile/investor/Main-Investor-Title.svelte
+++ b/src/lib/components/page/profile/investor/Main-Investor-Title.svelte
@@ -143,7 +143,9 @@
     ▓ NOTE:
     ▓ > Public Presale box.
     -->
-    <div
+    <a
+      href="https://betarena.com/public-presale"
+      target="_blank"
       class=
       "
       view-opt-box
@@ -163,11 +165,11 @@
         <TranslationText
           key={`${CNAME}/title`}
           text={profileTrs?.investor?.tab.tab_2}
-          fallback={'Public Presale (Soon)'}
+          fallback={'Public Presale'}
         />
       </p>
 
-    </div>
+    </a>
 
   </div>
 
@@ -272,6 +274,12 @@
       width: 100%;
     }
 
+    a.view-opt-box:hover p {
+      cursor: pointer;
+      color: var(--white) !important;
+      opacity: 1;
+    }
+
     div.view-opt-box
     {
       /* 🎨 style */

From 9c7a1eba9067bb1c6a61d2518ebbe6b50874f5aa Mon Sep 17 00:00:00 2001
From: migbash <20924663+migbash@users.noreply.github.com>
Date: Thu, 24 Oct 2024 08:22:44 +0000
Subject: [PATCH 4/4] 2.15.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1aece9eb8..1f77a9aee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "betarena-scores-platform",
-	"version": "2.15.2",
+	"version": "2.15.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "betarena-scores-platform",
-			"version": "2.15.2",
+			"version": "2.15.3",
 			"license": "ISC",
 			"dependencies": {
 				"@betarena/ad-engine": "0.0.51",
diff --git a/package.json b/package.json
index 6502a892d..bbc306ae8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "betarena-scores-platform",
-	"version": "2.15.2",
+	"version": "2.15.3",
 	"description": "Betarena Official Scores Platform (PWA)",
 	"author": "migbash",
 	"license": "ISC",