Merge pull request #1398 from RunOnFlux/development

v5.25.0
RunOnFlux · Sep 10, 2024 · e68f4ad · e68f4ad
2 parents 461812c + edc039c
commit e68f4ad
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 19 deletions.
diff --git a/HomeUI/dist/css/3137.css → HomeUI/dist/css/1732.css b/HomeUI/dist/css/3137.css → HomeUI/dist/css/1732.css
diff --git a/HomeUI/dist/css/7070.css → HomeUI/dist/css/3112.css b/HomeUI/dist/css/7070.css → HomeUI/dist/css/3112.css
diff --git a/HomeUI/dist/css/6575.css → HomeUI/dist/css/3209.css b/HomeUI/dist/css/6575.css → HomeUI/dist/css/3209.css
diff --git a/HomeUI/dist/css/5861.css → HomeUI/dist/css/5918.css b/HomeUI/dist/css/5861.css → HomeUI/dist/css/5918.css
diff --git a/HomeUI/dist/css/7585.css b/HomeUI/dist/css/7585.css
diff --git a/HomeUI/dist/css/9563.css b/HomeUI/dist/css/9563.css
diff --git a/HomeUI/dist/js/3137.js → HomeUI/dist/js/1732.js b/HomeUI/dist/js/3137.js → HomeUI/dist/js/1732.js
diff --git a/HomeUI/dist/js/7070.js → HomeUI/dist/js/3112.js b/HomeUI/dist/js/7070.js → HomeUI/dist/js/3112.js
diff --git a/HomeUI/dist/js/3209.js b/HomeUI/dist/js/3209.js
diff --git a/HomeUI/dist/js/5086.js b/HomeUI/dist/js/5086.js
diff --git a/HomeUI/dist/js/5861.js → HomeUI/dist/js/5918.js b/HomeUI/dist/js/5861.js → HomeUI/dist/js/5918.js
diff --git a/HomeUI/dist/js/6575.js b/HomeUI/dist/js/6575.js
diff --git a/HomeUI/dist/js/762.js b/HomeUI/dist/js/762.js
diff --git a/HomeUI/dist/js/7585.js → HomeUI/dist/js/9563.js b/HomeUI/dist/js/7585.js → HomeUI/dist/js/9563.js
diff --git a/HomeUI/dist/js/index.js b/HomeUI/dist/js/index.js
diff --git a/HomeUI/src/views/apps/Management.vue b/HomeUI/src/views/apps/Management.vue
@@ -10660,8 +10660,14 @@ export default {
         }
         this.fiatCheckoutURL = checkoutURL.data.data;
         this.checkoutLoading = false;
-        this.openSite(checkoutURL.data.data);
+        try {
+          this.openSite(checkoutURL.data.data);
+        } catch (error) {
+          console.log(error);
+          this.showToast('error', 'Failed to open Stripe checkout, pop-up blocked?');
+        }
       } catch (error) {
+        console.log(error);
         this.showToast('error', 'Failed to create stripe checkout');
         this.checkoutLoading = false;
       }
@@ -10714,8 +10720,14 @@ export default {
         }
         this.fiatCheckoutURL = checkoutURL.data.data;
         this.checkoutLoading = false;
-        this.openSite(checkoutURL.data.data);
+        try {
+          this.openSite(checkoutURL.data.data);
+        } catch (error) {
+          console.log(error);
+          this.showToast('error', 'Failed to open Paypal checkout, pop-up blocked?');
+        }
       } catch (error) {
+        console.log(error);
         this.showToast('error', 'Failed to create PayPal checkout');
         this.checkoutLoading = false;
       }

diff --git a/HomeUI/src/views/apps/RegisterFluxApp.vue b/HomeUI/src/views/apps/RegisterFluxApp.vue
@@ -3861,8 +3861,14 @@ export default {
         }
         this.fiatCheckoutURL = checkoutURL.data.data;
         this.checkoutLoading = false;
-        this.openSite(checkoutURL.data.data);
+        try {
+          this.openSite(checkoutURL.data.data);
+        } catch (error) {
+          console.log(error);
+          this.showToast('error', 'Failed to open Stripe checkout, pop-up blocked?');
+        }
       } catch (error) {
+        console.log(error);
         this.showToast('error', 'Failed to create stripe checkout');
         this.checkoutLoading = false;
       }
@@ -3915,8 +3921,14 @@ export default {
         }
         this.fiatCheckoutURL = checkoutURL.data.data;
         this.checkoutLoading = false;
-        this.openSite(checkoutURL.data.data);
+        try {
+          this.openSite(checkoutURL.data.data);
+        } catch (error) {
+          console.log(error);
+          this.showToast('error', 'Failed to open Paypal checkout, pop-up blocked?');
+        }
       } catch (error) {
+        console.log(error);
         this.showToast('error', 'Failed to create PayPal checkout');
         this.checkoutLoading = false;
       }

diff --git a/HomeUI/src/views/apps/marketplace/AppView.vue b/HomeUI/src/views/apps/marketplace/AppView.vue
@@ -1147,8 +1147,14 @@ export default {
         }
         fiatCheckoutURL.value = checkoutURL.data.data;
         checkoutLoading.value = false;
-        openSite(checkoutURL.data.data);
+        try {
+          openSite(checkoutURL.data.data);
+        } catch (error) {
+          console.log(error);
+          showToast('error', 'Failed to open Stripe checkout, pop-up blocked?');
+        }
       } catch (error) {
+        console.log(error);
         showToast('error', 'Failed to create stripe checkout');
         checkoutLoading.value = false;
       }
@@ -1206,8 +1212,14 @@ export default {
         }
         fiatCheckoutURL.value = checkoutURL.data.data;
         checkoutLoading.value = false;
-        openSite(checkoutURL.data.data);
+        try {
+          openSite(checkoutURL.data.data);
+        } catch (error) {
+          console.log(error);
+          showToast('error', 'Failed to open PayPal checkout, pop-up blocked?');
+        }
       } catch (error) {
+        console.log(error);
         showToast('error', 'Failed to create PayPal checkout');
         checkoutLoading.value = false;
       }

diff --git a/HomeUI/src/views/apps/marketplace/Marketplace.vue b/HomeUI/src/views/apps/marketplace/Marketplace.vue
@@ -397,9 +397,10 @@ export default {
             filteredApps.value = filteredApps.value.filter((appData) => appData.extraDetail.name.toLowerCase() === router.currentRoute.params.filter.toLowerCase());
           }
           if (searchQuery.value) {
+            const normalizedSearchQuery = searchQuery.value.toLowerCase();
             filteredApps.value = filteredApps.value.filter((appData) => {
-              if (appData.name.toLowerCase().includes(searchQuery.value)) return true;
-              if (appData.description.toLowerCase().includes(searchQuery.value)) return true;
+              if (appData.name.toLowerCase().includes(normalizedSearchQuery)) return true;
+              if (appData.description.toLowerCase().includes(normalizedSearchQuery)) return true;
               return false;
             });
           }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flux",
-  "version": "5.24.0",
+  "version": "5.25.0",
   "description": "Flux, Your Gateway to a Decentralized World",
   "repository": {
     "type": "git",