From 87f16397682628c4607e9ac629956439115c7c4f Mon Sep 17 00:00:00 2001
From: EmanuelCR03 <emanuel.castillo@fintecheando.mx>
Date: Wed, 17 Sep 2025 01:47:40 -0600
Subject: [PATCH] WEB-313 Fix server selector (#2656)

Co-authored-by: Soporte <soporte@MacBook-Pro-de-Fintecheando.local>
---
 src/app/login/login.component.html   | 5 +----
 src/app/login/login.component.ts     | 4 ++++
 src/assets/env.js                    | 3 +++
 src/assets/env.template.js           | 3 +++
 src/environments/.env.ts             | 3 +--
 src/environments/environment.prod.ts | 2 +-
 src/environments/environment.ts      | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index fe047bf56..5f374d5c1 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -43,10 +43,7 @@
     <div class="layout-row-reverse">
       <mifosx-language-selector class="p-t-10 p-r-10 width-40"></mifosx-language-selector>
       <mifosx-theme-toggle class="p-t-10"></mifosx-theme-toggle>
-      <mifosx-server-selector
-        class="p-t-10"
-        *ngIf="!environment.production && environment.allowServerSwitch"
-      ></mifosx-server-selector>
+      <mifosx-server-selector class="p-t-10" *ngIf="allowServerSwitch()"></mifosx-server-selector>
     </div>
 
     <!-- Logo with Organization Name -->
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index cdb35fb5a..f58f9ebf4 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -110,4 +110,8 @@ export class LoginComponent implements OnInit, OnDestroy {
   displayTenantSelector(): boolean {
     return environment.displayTenantSelector === 'false' ? false : true;
   }
+
+  allowServerSwitch(): boolean {
+    return environment.allowServerSwitch === 'false' ? false : true;
+  }
 }
diff --git a/src/assets/env.js b/src/assets/env.js
index 11be5fe00..8755c99e6 100644
--- a/src/assets/env.js
+++ b/src/assets/env.js
@@ -20,6 +20,9 @@
   // Char delimiter to Export CSV options: ',' ';' '|' ' '
   window['env']['defaultCharDelimiter'] = '';
 
+  // Display or not the Server Selector
+  window['env']['allowServerSwitch'] = '';
+  
   // Display or not the BackEnd Info
   window['env']['displayBackEndInfo'] = '';
 
diff --git a/src/assets/env.template.js b/src/assets/env.template.js
index 00a70a91d..ad212d178 100644
--- a/src/assets/env.template.js
+++ b/src/assets/env.template.js
@@ -20,6 +20,9 @@
   // Char delimiter to Export CSV options: ',' ';' '|' ' '
   window['env']['defaultCharDelimiter'] = '$MIFOS_DEFAULT_CHAR_DELIMITER';
 
+  // Display or not the Server Selector
+  window['env']['allowServerSwitch'] = '$MIFOS_ALLOW_SERVER_SWITCH_SELECTOR';
+
   // Display or not the BackEnd Info
   window['env']['displayBackEndInfo'] = '$MIFOS_DISPLAY_BACKEND_INFO';
 
diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index 388dbeff8..54c247734 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -4,7 +4,6 @@ export default {
   'mifos_x': {
     'version': '250828',
     'hash': 'b92f79e2'
-  },
-  'allow_switching_backend_instance': true
+  }
 };
 /* tslint:enable */
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 705028994..d36b57192 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -20,7 +20,7 @@ export const environment = {
     loadedEnv['fineractApiUrl'] ||
     (loadedEnv['fineractApiUrls']?.length > 0 ? loadedEnv['fineractApiUrls'].split(',')[0] : window.location.origin),
   oauthServerUrl: loadedEnv['oauthServerUrl'] || loadedEnv['fineractApiUrl'] + loadedEnv['apiProvider'],
-  allowServerSwitch: env.allow_switching_backend_instance,
+  allowServerSwitch: loadedEnv.allowServerSwitch || 'true',
   apiProvider: loadedEnv['apiProvider'] || '/fineract-provider/api',
   apiVersion: loadedEnv['apiVersion'] || '/v1',
   serverUrl: '',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 811707f0a..3d740c3ad 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -24,7 +24,7 @@ export const environment = {
   baseApiUrl:
     loadedEnv.fineractApiUrl ||
     (loadedEnv.fineractApiUrls?.length > 0 ? loadedEnv.fineractApiUrls.split(',')[0] : window.location.origin),
-  allowServerSwitch: env.allow_switching_backend_instance,
+  allowServerSwitch: loadedEnv.allowServerSwitch || 'true',
   apiProvider: loadedEnv.apiProvider || '/fineract-provider/api',
   apiVersion: loadedEnv.apiVersion || '/v1',
   serverUrl: '',