From d58705dae753d97555020fc08b699b04ecdfd115 Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:09:40 -0500
Subject: [PATCH] string replace end of choreo url (#1158)

---
 lib/pangea/config/environment.dart | 16 +++++++++++-----
 pubspec.yaml                       |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/pangea/config/environment.dart b/lib/pangea/config/environment.dart
index 473c541d5..77002fc28 100644
--- a/lib/pangea/config/environment.dart
+++ b/lib/pangea/config/environment.dart
@@ -10,10 +10,6 @@ class Environment {
 
   static bool get isStaging => synapsURL.contains("staging");
 
-  static String get baseAPI {
-    return dotenv.env["BASE_API"] ?? 'BASE API not found';
-  }
-
   static String get frontendURL {
     return dotenv.env["FRONTEND_URL"] ?? "Frontend URL NOT FOUND";
   }
@@ -27,7 +23,17 @@ class Environment {
   }
 
   static String get choreoApi {
-    return dotenv.env['CHOREO_API'] ?? 'Not found';
+    final envEntry = dotenv.env['CHOREO_API'];
+    if (envEntry == null) {
+      return "Not found";
+    }
+    if (envEntry.endsWith("/choreo")) {
+      return envEntry.replaceAll("/choreo", "");
+    }
+    if (envEntry.endsWith("/choreo/")) {
+      return envEntry.replaceAll("/choreo/", "");
+    }
+    return envEntry;
   }
 
   static String get choreoApiKey {
diff --git a/pubspec.yaml b/pubspec.yaml
index 8028cd23b..f51bc9450 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ description: Learn a language while texting your friends.
 # Pangea#
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 1.23.16+3575
+version: 1.23.17+3576
 
 environment:
   sdk: ">=3.0.0 <4.0.0"