From db24d216210e0038f92e634de1ab8a46fbce4632 Mon Sep 17 00:00:00 2001
From: Tara Rostami <132676256+TaraRostami@users.noreply.github.com>
Date: Sat, 20 Apr 2024 22:15:36 +0330
Subject: UI Improvements (#2228)

* UI Improvements

Better Table
Update QR Code Modal
Better Info Modal
Compression HTML files
Better Dropdown Menu
Better Calendar
and more ..
Remove files
Minor Fixes
---
 web/assets/js/model/outbound.js | 12 ++++++------
 web/assets/js/model/xray.js     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'web/assets/js/model')

diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js
index c6fb6201..1cb1df21 100644
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -690,12 +690,12 @@ class Outbound extends CommonClass {
                 url.searchParams.get('quicSecurity') ?? 'none',
                 url.searchParams.get('key') ?? '',
                 headerType ?? 'none');
-            } else if (type === 'grpc') {
-                stream.grpc = new GrpcStreamSettings(
-                    url.searchParams.get('serviceName') ?? '',
-                    url.searchParams.get('authority') ?? '',
-                    url.searchParams.get('mode') == 'multi');
-            } else if (type === 'httpupgrade') {
+        } else if (type === 'grpc') {
+            stream.grpc = new GrpcStreamSettings(
+                url.searchParams.get('serviceName') ?? '',
+                url.searchParams.get('authority') ?? '',
+                url.searchParams.get('mode') == 'multi');
+        } else if (type === 'httpupgrade') {
             stream.httpupgrade = new HttpUpgradeStreamSettings(path,host);
         }
 
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 5040af04..7fffffd4 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -2472,7 +2472,7 @@ Inbound.WireguardSettings.Peer = class extends XrayCommonClass {
             if (a.length>0 && !a.includes('/')) this.allowedIPs[index] += '/32';
         });
         return {
-            privateKey: this.privateKey,            
+            privateKey: this.privateKey,
             publicKey: this.publicKey,
             preSharedKey: this.psk.length>0 ? this.psk : undefined,
             allowedIPs: this.allowedIPs,
-- 
cgit v1.2.3