Minor adjustments regarding the registration of the connection method

Improved execution flow of the controller to prevent connection to Iranian IPs in the Go method, specifically when the user has switched from the Warp method to Go without disconnecting
bepass-org · Jan 4, 2025 · f30a1dc · f30a1dc
1 parent 649531e
commit f30a1dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/renderer/pages/Landing/useLanding.ts b/src/renderer/pages/Landing/useLanding.ts
@@ -47,7 +47,9 @@ const useLanding = () => {
         statusText,
         setStatusText,
         proxyStatus,
-        setProxyStatus
+        setProxyStatus,
+        proxyMethod,
+        setProxyMethod
     } = useStore();
     const [ipInfo, setIpInfo] = useState<IpConfig>({
         countryCode: false,
@@ -101,6 +103,7 @@ const useLanding = () => {
                 ip: ''
             });
             setProxyStatus(proxyMode);
+            setProxyMethod(method);
             ipcRenderer.sendMessage('wp-start');
             setIsLoading(true);
             setPing(0);
@@ -201,6 +204,7 @@ const useLanding = () => {
                     ip: ''
                 });
                 setProxyStatus(proxyMode);
+                setProxyMethod(method);
                 ipcRenderer.sendMessage('wp-start');
                 setIsLoading(true);
                 setPing(0);
@@ -384,7 +388,7 @@ const useLanding = () => {
         if (typeof ipInfo?.countryCode != 'string') return;
         if (method === '' && ipInfo?.countryCode === 'ir') {
             ipToast();
-        } else if (method === 'gool' && ipInfo?.countryCode === 'ir') {
+        } else if (proxyMethod === 'gool' && ipInfo?.countryCode === 'ir') {
             ipcRenderer.sendMessage('wp-end', 'stop-from-gool');
             setIsLoading(true);
             loadingToast(appLang.status.keep_trying);

diff --git a/src/renderer/store.ts b/src/renderer/store.ts
@@ -10,6 +10,8 @@ export interface IStore {
     setStatusText: (status: string) => void;
     proxyStatus: string;
     setProxyStatus: (status: string) => void;
+    proxyMethod: string;
+    setProxyMethod: (method: string) => void;
 }
 
 const appLang = getTranslate('en');
@@ -21,5 +23,7 @@ export const useStore = create<IStore>((set) => ({
     statusText: appLang.status.disconnected,
     setStatusText: (status: string) => set(() => ({ statusText: status })),
     proxyStatus: '',
-    setProxyStatus: (status: string) => set(() => ({ proxyStatus: status }))
+    setProxyStatus: (status: string) => set(() => ({ proxyStatus: status })),
+    proxyMethod: '',
+    setProxyMethod: (method: string) => set(() => ({ proxyMethod: method }))
 }));