From 76c56612cfb2a23b516be27c55dcb9b73e38a75f Mon Sep 17 00:00:00 2001
From: Nuwan <nuwanchaturanga@gmail.com>
Date: Thu, 16 Mar 2023 12:26:29 +0530
Subject: [PATCH] fix showing build upgrade message on app startup

---
 ruby/lib/jam_ruby/models/artifact_update.rb | 11 ++++++++++-
 web/app/assets/javascripts/clientUpdate.js  |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/artifact_update.rb b/ruby/lib/jam_ruby/models/artifact_update.rb
index ae6f66596..e2bf6cc1a 100644
--- a/ruby/lib/jam_ruby/models/artifact_update.rb
+++ b/ruby/lib/jam_ruby/models/artifact_update.rb
@@ -3,8 +3,17 @@ module JamRuby
 
     DEFAULT_ENVIRONMENT = 'public'
     CLIENT_PREFIX = 'JamClient'
+    CLIENT_PREFIX_MODERN = 'JamClientModern'
 
-    PRODUCTS = ["#{CLIENT_PREFIX}/Win32", "#{CLIENT_PREFIX}/MacOSX", "#{CLIENT_PREFIX}/JamBlaster", "#{CLIENT_PREFIX}/JamBlasterClient"]
+    PRODUCTS = [
+      "#{CLIENT_PREFIX}/Win32", 
+      "#{CLIENT_PREFIX}/MacOSX", 
+      "#{CLIENT_PREFIX}/JamBlaster", 
+      "#{CLIENT_PREFIX}/JamBlasterClient",
+      "#{CLIENT_PREFIX_MODERN}/Win32",
+      "#{CLIENT_PREFIX_MODERN}/MacOSX-Intel",
+      "#{CLIENT_PREFIX_MODERN}/MacOSX-M1"
+    ]
 
     self.primary_key = 'id'
     attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin
diff --git a/web/app/assets/javascripts/clientUpdate.js b/web/app/assets/javascripts/clientUpdate.js
index 399365e66..544ec4598 100644
--- a/web/app/assets/javascripts/clientUpdate.js
+++ b/web/app/assets/javascripts/clientUpdate.js
@@ -256,7 +256,7 @@
     // check if updated is needed
     async function check() {
 
-      var os = await context.JK.GetOSAsString();
+      var os = await context.JK.getDetailedOS();
       //os = 'Win32'
 
       // check kill switch before all other logic
@@ -265,7 +265,8 @@
         return;
       }
 
-      var product = "JamClient"
+      //var product = "JamClient"
+      var product = "JamClientModern"
       var currentVersion = await context.jamClient.ClientUpdateVersion();
 
       if (!forceShow && (currentVersion == null || currentVersion.indexOf("Compiled")) > -1) {