build-all.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Windows
-GOOS=windows GOARCH=amd64 go build -o ./bin/win/wireguard-go.exe ./wireguard-go
-
-# Linux
-GOOS=linux GOARCH=amd64 go build -o ./bin/linux/wireguard-go ./wireguard-go
-
-# macOS Intel
-GOOS=darwin GOARCH=amd64 go build -o ./bin/mac/wireguard-go ./wireguard-go
-
-# macOS ARM
-GOOS=darwin GOARCH=arm64 go build -o ./bin/mac/wireguard-go-arm ./wireguard-go

package.json

@@ -70,14 +70,6 @@
       {
         "from": "src/assets",
         "to": "assets"
-      },
-      {
-        "from": "resources/wireguard-install",
-        "to": "wireguard-install"
-      },
-      {
-        "from": "resources/wireguard",
-        "to": "wireguard"
       }
     ],
     "mac": {
@@ -91,7 +83,6 @@
       }
     },
     "win": {
-      "requestedExecutionLevel": "requireAdministrator",
       "target": [
         {
           "target": "nsis",

resources/wireguard/mac/wg0.conf

@@ -1,10 +0,0 @@
-[Interface]
-PrivateKey = CEzCd25ufxbOjvRhMqLfkcdP/OziG5i6OkXCfMZrI1I=
-Address = 10.0.0.2/24
-DNS = 1.1.1.1
-
-[Peer]
-PublicKey = jG+7H5thEiNjxY1XqI1R9oyMAMTIegLwE3tZkS1Rj2U=
-Endpoint = 35.95.209.161:51820
-AllowedIPs = 10.0.0.0/24
-PersistentKeepalive = 25

resources/wireguard/windows/wg0.conf

@@ -1,10 +0,0 @@
-[Interface]
-PrivateKey = CEzCd25ufxbOjvRhMqLfkcdP/OziG5i6OkXCfMZrI1I=
-Address = 10.0.0.2/24
-DNS = 1.1.1.1
-
-[Peer]
-PublicKey = jG+7H5thEiNjxY1XqI1R9oyMAMTIegLwE3tZkS1Rj2U=
-Endpoint = 35.95.209.161:51820
-AllowedIPs = 10.0.0.0/24
-PersistentKeepalive = 25

src/electron/api/axiosClient.ts

@@ -12,7 +12,7 @@ const httpsAgent = new https.Agent({
 });
 
 const api: AxiosInstance = axios.create({
-    baseURL: 'https://quality-friendly-goldfish.ngrok-free.app/api/v1/va', // 🔁 your backend
+    baseURL: 'https://daniela-nonprofessed-boastfully.ngrok-free.app/api/v1/va', // 🔁 your backend
     httpsAgent
     // timeout: 10000,
 });

src/electron/ipc/ipcHandler.ts

@@ -3,7 +3,6 @@ import { getToken, saveToken, clearToken } from "../utils/tokenHelper.js";
 import { getActiveApp, handleLogin, takeScreenshot, startWindowPolling, getRunningAppsList, captureSpecificApp } from "../utils/utilityFunctions.js";
 import api from "../api/axiosClient.js";
 import { getMainWindow } from '../main.js';
-import { startVPN, stopVPN } from "../vpn.js";
 
 
 
@@ -494,47 +493,6 @@ ipcMain.handle("get-adjustments-list", async (event, vaId: string) => {
 });
 
 
-ipcMain.handle("update-payment", async (event, data: Record<string, any>) => {
-  console.log("data-update-payment", data);
-
-  // Build userDetails object
-  const userDetails: Record<string, any> = {
-    paymentMethod: data.paymentMethod,
-  };
-
-  // Add payment-specific fields
-  if (data.paymentMethod === "wise" && data.wiseEmail) {
-    userDetails.wiseEmail = data.wiseEmail;
-    // Clear veemAccount when switching to wise
-    userDetails.veemAccount = "";
-  } else if (data.paymentMethod === "veem" && data.veemAccount) {
-    userDetails.veemAccount = data.veemAccount;
-    // Clear wiseEmail when switching to veem
-    userDetails.wiseEmail = "";
-  }
-
-  // Build final payload
-  const payload = {
-    userDetails: userDetails,
-  };
-
-  console.log("Update Payment payload", payload);
-
-  try {
-    const response = await api.patch("/profile", payload);
-    console.log("Update-payment-response", response);
-    return { success: true, data: response?.data?.userDetails };
-  } catch (error: any) {
-    console.error("❌ Update payment error:", error.message);
-    return {
-      success: false,
-      message: error.response?.data?.message || "Payment update failed",
-    };
-  }
-});
-
-
-
 
 export const sendTokenExpired = () => {
   console.log("⚠️ Sending token-expired event to renderer");
@@ -547,10 +505,4 @@ export const sendTokenExpired = () => {
 };
 
 
-ipcMain.handle("vpn-connect", async () => {
+;
-  return startVPN();
-});
-
-ipcMain.handle("vpn-disconnect", async () => {
-  stopVPN();
-});

src/electron/main.ts

@@ -8,9 +8,6 @@ import "./ipc/ipcHandler.js";
 import path from "path";
 import { fileURLToPath } from "url";
 
-import * as fs from "fs";
-import { execFile } from "child_process";
-
 app.setAppUserModelId("com.tracker.app");
 
 const __filename = fileURLToPath(import.meta.url);
@@ -55,26 +52,12 @@ app.on("second-instance", () => {
   }
 });
 
-
-// CHECKING IF WIREGUARD EXIST - IF NOT INSTALLING IN CLIENT MACHINE
-const wgPath = "C:\\Program Files\\WireGuard\\wireguard.exe";
-
-if (!fs.existsSync(wgPath)) {
-  const installer = path.join(process.resourcesPath, "wireguard-install", "wireguard-installer.exe");
-
-  execFile(installer, ["/quiet"], (err) => {
-    if (err) console.error("WireGuard install failed:", err);
-    else console.log("WireGuard installed successfully.");
-  });
-}
-// CHECKING IF WIREGUARD EXIST - IF NOT INSTALLING IN CLIENT MACHINE
-
-
 // ---------------------------
 // MAIN APP READY
 // ---------------------------
 app.on("ready", async () => {
 
+
   splashWindow = new BrowserWindow({
     width: 300,
     height: 300,

src/electron/preload.cts

@@ -34,12 +34,6 @@ contextBridge.exposeInMainWorld('electron', {
   changePassword: (data: { oldPassword: string; password: string; cPassword: string }) =>
     ipcRenderer.invoke("change-password", data),
 
-  updatePayment: (data: {
-    paymentMethod: string;
-    wiseEmail?: string;
-    veemAccount?: string;
-  }) => ipcRenderer.invoke('update-payment', data),
-
   onTokenExpired: (callback) => {
     // Remove old listeners
     ipcRenderer.removeAllListeners("token-expired");
@@ -65,9 +59,6 @@ contextBridge.exposeInMainWorld('electron', {
   getLeaveList: () => ipcRenderer.invoke("get-leave-list"),
   getAdjustmentsList:(vaId: string) => ipcRenderer.invoke("get-adjustments-list",vaId),
 
-  connectVPN: () => ipcRenderer.invoke("vpn-connect"),
-  disconnectVPN: () => ipcRenderer.invoke("vpn-disconnect"),
-
 } satisfies Window['electron']);
 
 // function ipcInvoke<Key extends keyof EventPayloadMapping>(

src/electron/vpn.ts

@@ -1,223 +0,0 @@
-import { app } from "electron";
-import { exec, execFile } from "child_process";
-import fs from "fs";
-import os from "os";
-import path from "path";
-
-//
-// ------------------ HELPERS ------------------
-//
-
-// Promise wrapper for exec()
-function execPromise(cmd: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(cmd, (err, stdout, stderr) => {
-      if (err) return reject(stderr || err);
-      resolve(stdout);
-    });
-  });
-}
-
-// Detect dev vs production
-function isDev() {
-  return !app.isPackaged;
-}
-
-//
-// ------------------ PATH RESOLVERS ------------------
-//
-
-// WireGuard installer path (Windows only)
-// function getWireGuardInstallerPath(): string {
-//   return isDev()
-//     ? path.join(process.cwd(), "resources", "wireguard-install", "wireguard-installer.exe")
-//     : path.join(process.resourcesPath, "wireguard-install", "wireguard-installer.exe");
-// }
-
-function getWireGuardInstallerPath(): string {
-  const devPath = path.join(process.cwd(), "resources", "wireguard-install", "wireguard-installer.exe");
-
-  // When running "npm run dev", use devPath ALWAYS
-  if (!app.isPackaged) {
-    console.log("DEV MODE Installer Path:", devPath);
-    return devPath;
-  }
-
-  // Production build path
-  const prodPath = path.join(process.resourcesPath, "wireguard-install", "wireguard-installer.exe");
-  console.log("PROD MODE Installer Path:", prodPath);
-  return prodPath;
-}
-
-
-// OS-specific wg0.conf
-function getConfigPath(): string {
-  const base = isDev()
-    ? path.join(process.cwd(), "resources", "wireguard")
-    : path.join(process.resourcesPath, "wireguard");
-
-  if (process.platform === "win32") {
-    return path.join(base, "windows", "wg0.conf");
-  }
-
-  if (process.platform === "darwin") {
-    return path.join(base, "macos", "wg0.conf");
-  }
-
-  throw new Error("Unsupported OS");
-}
-
-// Detect installed WireGuard.exe on Windows
-function findWireGuardCLI(): string | null {
-  const possiblePaths = [
-    "C:\\Program Files\\WireGuard\\wireguard.exe",
-    "C:\\Program Files (x86)\\WireGuard\\wireguard.exe"
-  ];
-
-  for (const p of possiblePaths) {
-    if (fs.existsSync(p)) return p;
-  }
-
-  return null;
-}
-
-//
-// ------------------ WINDOWS INSTALL LOGIC ------------------
-//
-
-// Install WireGuard silently
-async function ensureWireGuardInstalled(): Promise<string> {
-  let cli = findWireGuardCLI();
-  if (cli) return cli;
-
-  // Installer path
-  const installer = getWireGuardInstallerPath();
-  if (!fs.existsSync(installer)) {
-    throw new Error("WireGuard installer not found in resources.");
-  }
-
-  console.log("WireGuard not found. Installing silently...");
-  await execPromise(`"${installer}" /quiet`);
-
-  cli = findWireGuardCLI();
-  if (!cli) throw new Error("WireGuard installation failed.");
-
-  console.log("WireGuard installed successfully:", cli);
-  return cli;
-}
-
-//
-// ------------------ WINDOWS CONNECT/DISCONNECT ------------------
-//
-
-// async function connectWindows(): Promise<string> {
-//   const cli = await ensureWireGuardInstalled();
-//   const conf = getConfigPath();
-
-//   // Disable GUI auto popup
-//   await execPromise(
-//     `reg add "HKCU\\Software\\WireGuard" /v SuppressTray /t REG_DWORD /d 1 /f`
-//   );
-
-//   return new Promise((resolve, reject) => {
-//     execFile(cli, ["/installtunnelservice", conf], (err) => {
-//       if (err) return reject("Failed to connect VPN: " + err);
-//       resolve("Windows VPN connected without GUI");
-//     });
-//   });
-// }
-
-// let wgRuntimeProcess: any = null;
-
-// async function connectWindows(): Promise<string> {
-//   const cli = await ensureWireGuardInstalled();
-//   const conf = getConfigPath();
-
-//   return new Promise((resolve, reject) => {
-//     wgRuntimeProcess = execFile(cli, ["/tunnelservice", conf], (err) => {
-//       if (err) return reject("VPN connection error: " + err);
-//     });
-
-//     // Wait a bit for interface to come up
-//     setTimeout(() => resolve("Windows VPN connected silently"), 800);
-//   });
-// }
-
-
-async function connectWindows(): Promise<string> {
-  const cli = await ensureWireGuardInstalled();
-  const conf = getConfigPath();
-
-  // Disable GUI popup and silent mode (ignore errors)
-  await execPromise(`reg add "HKCU\\Software\\WireGuard" /v HideTrayIcon /t REG_DWORD /d 1 /f`).catch(() => {});
-  await execPromise(`reg add "HKCU\\Software\\WireGuard" /v SuppressTray /t REG_DWORD /d 1 /f`).catch(() => {});
-  await execPromise(`reg delete "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v WireGuard /f`).catch(() => {});
-
-  // Start background service
-  await execPromise(`sc start WireGuardManager`).catch(() => {});
-
-  return new Promise((resolve, reject) => {
-    execFile(cli, ["/installtunnelservice", conf], (err) => {
-      if (err) return reject("VPN connection failed: " + err);
-      resolve("Windows VPN connected silently");
-    });
-  });
-}
-
-// function disconnectWindows(): Promise<string> {
-//   const cli = findWireGuardCLI();
-//   if (!cli) return Promise.reject("WireGuard CLI not found");
-
-//   return execPromise(`"${cli}" /uninstalltunnelservice wg0`);
-// }
-
-async function disconnectWindows(): Promise<string> {
-  const cli = findWireGuardCLI();
-  if (!cli) throw new Error("WireGuard CLI not found");
-
-  // 1. Remove the installed tunnel service
-  await execPromise(`"${cli}" /uninstalltunnelservice wg0`);
-
-  // 2. Ensure background service is still running (optional clean-up)
-  // Windows sometimes marks the service as "stopped" after uninstall
-  await execPromise(`sc stop WireGuardTunnel$wg0`).catch(() => { });
-  await execPromise(`sc stop WireGuardManager`).catch(() => { });
-
-  return "Windows VPN disconnected";
-}
-
-
-//
-// ------------------ MACOS CONNECT/DISCONNECT ------------------
-//
-
-function connectMac(): Promise<string> {
-  const conf = getConfigPath();
-  return execPromise(`sudo wg-quick up "${conf}"`).then(() => "macOS VPN connected");
-}
-
-function disconnectMac(): Promise<string> {
-  return execPromise(`sudo wg-quick down wg0`).then(() => "macOS VPN disconnected");
-}
-
-//
-// ------------------ PUBLIC API ------------------
-//
-
-export function startVPN(): Promise<string> {
-  const platform = os.platform();
-
-  if (platform === "win32") return connectWindows();
-  if (platform === "darwin") return connectMac();
-
-  return Promise.reject("Unsupported OS");
-}
-
-export function stopVPN(): Promise<string> {
-  const platform = os.platform();
-
-  if (platform === "win32") return disconnectWindows();
-  if (platform === "darwin") return disconnectMac();
-
-  return Promise.reject("Unsupported OS");
-}

src/ui/helper/ToastContext.tsx

@@ -1,99 +0,0 @@
-// contexts/ToastContext.tsx
-import React, { createContext, useContext, useState, ReactNode } from 'react';
-
-interface Toast {
-  id: number;
-  message: string;
-  type: 'success' | 'error' | 'info' | 'warning';
-}
-
-interface ToastContextType {
-  showToast: (message: string, type?: Toast['type']) => void;
-  hideToast: (id: number) => void;
-}
-
-const ToastContext = createContext<ToastContextType | undefined>(undefined);
-
-export const ToastProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
-  const [toasts, setToasts] = useState<Toast[]>([]);
-
-  const showToast = (message: string, type: Toast['type'] = 'success') => {
-    const id = Date.now();
-    setToasts(prev => [...prev, { id, message, type }]);
-    
-    // Auto remove after 5 seconds
-    setTimeout(() => {
-      hideToast(id);
-    }, 3000);
-  };
-
-  const hideToast = (id: number) => {
-    setToasts(prev => prev.filter(toast => toast.id !== id));
-  };
-
-  return (
-    <ToastContext.Provider value={{ showToast, hideToast }}>
-      {children}
-      <ToastContainer toasts={toasts} hideToast={hideToast} />
-    </ToastContext.Provider>
-  );
-};
-
-export const useToast = () => {
-  const context = useContext(ToastContext);
-  if (!context) {
-    throw new Error('useToast must be used within a ToastProvider');
-  }
-  return context;
-};
-
-const ToastContainer: React.FC<{
-  toasts: Toast[];
-  hideToast: (id: number) => void;
-}> = ({ toasts, hideToast }) => {
-  const getTypeStyles = (type: Toast['type']) => {
-    switch (type) {
-      case 'success':
-        return 'bg-success text-success-content';
-      case 'error':
-        return 'bg-error text-error-content';
-      case 'warning':
-        return 'bg-warning text-warning-content';
-      case 'info':
-        return 'bg-info text-info-content';
-      default:
-        return 'bg-neutral text-neutral-content';
-    }
-  };
-
-  return (
-  <div className="toast toast-center toast-top z-2000">
-    {toasts.map((toast) => (
-      <div
-        key={toast.id}
-        className="w-full max-w-md px-2 mb-2"
-      >
-        <div
-          className={`alert ${getTypeStyles(toast.type)} shadow-lg flex items-start`}
-          onClick={() => hideToast(toast.id)}
-        >
-          <div className="flex-grow min-w-0">
-            <p className="text-sm break-words whitespace-pre-wrap">
-              {toast.message}
-            </p>
-          </div>
-          <button
-            className="btn btn-ghost btn-xs flex-shrink-0 ml-2"
-            onClick={(e) => {
-              e.stopPropagation();
-              hideToast(toast.id);
-            }}
-          >
-            ✕
-          </button>
-        </div>
-      </div>
-    ))}
-  </div>
-);
-};

src/ui/layout/DashboardLayout.tsx

@@ -727,24 +727,6 @@ const DashboardLayout = () => {
   return (
     <>
       <div className="flex flex-col h-screen overflow-hidden">
-        <button
-          onClick={() => {
-            window.electron.connectVPN().then((msg) => {
-              console.log(msg);
-            });
-          }}
-        >
-          Connect VPN
-        </button>
-
-        <button
-          onClick={() => {
-            window.electron.disconnectVPN();
-          }}
-        >
-          Disconnect VPN
-        </button>
-
         {/* Header */}
         {isTracking &&
           <header className="w-full flex justify-between items-center px-4 py-2 bg-base-100 border-b border-base-300 sticky top-0 z-30">

src/ui/main.tsx

@@ -4,12 +4,9 @@ import App from './App'
 import './index.css'
 import { Provider } from "react-redux";
 import { store } from "./store";
-import { ToastProvider } from './helper/ToastContext';
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
   <Provider store={store}>
-    <ToastProvider>
     <App />
-    </ToastProvider>
   </Provider>
 )

src/ui/pages/Dashboard.tsx

@@ -133,7 +133,7 @@ const Dashboard: React.FC = () => {
     try {
       console.log("📡 Fetching projects...Dashboard");
       const res = await window.electron.getProjectList();
-      console.log(" Project list response in dashboard: ", res.data?.[0]);
+      console.log(" Project list response in dashboard:", res);
 
       if (res?.success && Array.isArray(res.data)) {
         // Store data redux store 
@@ -152,11 +152,9 @@ const Dashboard: React.FC = () => {
         );
 
         // Auto-select first project
-        if (res.data.length > 0) {
+        if (res.data.length > 0 && !selectedProject) {
           const firstProject = res.data[0];
 
-
-          console.log("Line 158" , firstProject)
           // Select the project
           dispatch(setSelectedProjectSlice(firstProject));
 

src/ui/pages/LeaveAndAdjustments/tabs/AdjustmentTab.tsx

@@ -5,7 +5,6 @@ import { quillModules } from '../../../utils/quillConfig';
 import Quill from 'quill';
 import 'quill/dist/quill.snow.css';
 import { useNavigate } from 'react-router-dom';
-import { useToast } from '../../../helper/ToastContext';
 
 interface Project {
   projectId: string;
@@ -51,7 +50,6 @@ const AdjustmentTab: React.FC<AdjustmentTabProps> = ({ projects }) => {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const quillRef = useRef<any>(null);
   const navigate = useNavigate()
-   const { showToast } = useToast();
 
   // Field validation functions
   const validateProjectId = (projectId: string): string | undefined => {
@@ -462,14 +460,9 @@ const AdjustmentTab: React.FC<AdjustmentTabProps> = ({ projects }) => {
 
       if (res?.success) {
         console.log("Timesheet Created Successfully");
+        alert(res.message);
         resetForm();
-        // Show success toast instead of alert
+        navigate('/dashboard/leave-adjustments')
-            showToast("PTO Request submitted successfully!", "success");
-
-            // Navigate after a small delay
-            setTimeout(() => {
-                navigate('/dashboard/leave-adjustments');
-            }, 300);
       } else {
         setFormErrors(prev => ({
           ...prev,
@@ -482,7 +475,6 @@ const AdjustmentTab: React.FC<AdjustmentTabProps> = ({ projects }) => {
         ...prev,
         general: err.message || "Something went wrong while saving timesheet"
       }));
-      showToast(err.message || "Something went wrong while saving timesheet", "error");
     } finally {
       setIsSubmitting(false);
     }

src/ui/pages/LeaveAndAdjustments/tabs/PtoLeaveTab.tsx

@@ -5,7 +5,6 @@ import ReactQuill from "react-quill-new";
 import Quill from "quill";
 import "quill/dist/quill.snow.css";
 import { useNavigate } from "react-router-dom";
-import { useToast } from "../../../helper/ToastContext";
 
 interface LeaveFormData {
     fromDate: string;
@@ -27,9 +26,6 @@ const PtoLeaveTab: React.FC<{
     const quillRef = useRef<any>(null);
     const navigate = useNavigate()
 
-    const { showToast } = useToast();
-
-    console.log("ptoLeave", ptoLeave)
     const [errors, setErrors] = useState<Partial<LeaveFormData>>({});
 
     useEffect(() => {
@@ -204,18 +200,11 @@ const PtoLeaveTab: React.FC<{
 
         if (result.success) {
             resetForm();
-            // Show success toast instead of alert
+            alert("PTO Request submitted!");
-            showToast("PTO Request submitted successfully!", "success");
+            navigate('/dashboard/leave-adjustments')
-
-            // Navigate after a small delay
-            setTimeout(() => {
-                navigate('/dashboard/leave-adjustments');
-            }, 300);
         } else {
             setServerError(result.message || "Something went wrong");
-            showToast(result.message || "Failed to submit PTO request", "error");
         }
-
     };
 
     return (
@@ -224,6 +213,7 @@ const PtoLeaveTab: React.FC<{
             <div className="max-w-4xl space-y-3 ">
                 <div className="grid grid-cols-2 gap-4">
 
+
                     {/* From Date */}
                     <div className="form-control">
                         <label className="label">

src/ui/pages/LeaveAndAdjustments/tabs/SickLeaveTab.tsx

@@ -4,7 +4,6 @@ import ReactQuill from "react-quill-new";
 import Quill from "quill";
 import "quill/dist/quill.snow.css"; // correct CSS
 import { useNavigate } from 'react-router-dom';
-import { useToast } from '../../../helper/ToastContext';
 
 interface LeaveFormData {
     fromDate: string;
@@ -25,7 +24,6 @@ const SickLeaveTab: React.FC<{
     const quillRef = useRef<any>(null);
     const [sickErrors, setSickErrors] = useState<Partial<LeaveFormData>>({});
     const navigate = useNavigate()
-    const { showToast } = useToast();
 
     useEffect(() => {
         const editor = quillRef.current?.getEditor();
@@ -218,16 +216,10 @@ const SickLeaveTab: React.FC<{
 
         if (result.success) {
             resetForm();
-             // Show success toast instead of alert
+            alert("SICK leave applied!");
-            showToast("SICK Request submitted successfully!", "success");
+            navigate('/dashboard/leave-adjustments')
-
-            // Navigate after a small delay
-            setTimeout(() => {
-                navigate('/dashboard/leave-adjustments');
-            }, 300);
         } else {
             setServerError(result.message || "Something went wrong");
-            showToast(result.message || "Failed to submit SICK request", "error");
         }
     };
 

src/ui/pages/Settings/SettingModal/ChangePaymentModal.tsx

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from "react";
 import { CreditCard } from "lucide-react";
 import { useSelector, useDispatch } from "react-redux";
 import { RootState } from "../../../store";
-import { setProfile } from "../../../store/profileSlice";
 
 interface ChangePaymentModalProps {
   isOpen: boolean;
@@ -56,55 +55,23 @@ const ChangePaymentModal: React.FC<ChangePaymentModalProps> = ({
 
     setLoading(true);
 
-        try {
+    // try {
-            // Prepare data for API
+    //   // Replace with your electron API
-            const updateData: any = {
+    //   await window.electron.updatePayment({
-                paymentMethod: method
+    //     method,
-            };
+    //     wiseEmail: method === "wise" ? wiseEmail.trim() : "",
+    //     veemAccount: method === "veem" ? veemAccount.trim() : "",
+    //   });
 
-            // Add appropriate field based on selection
+    //   // Refresh or update Redux
-            if (method === "wise") {
+    //   // dispatch(updateProfile({...}));
-                updateData.wiseEmail = wiseEmail.trim();
-            } else if (method === "veem") {
-                updateData.veemAccount = veemAccount.trim();
-            }
 
-            console.log("Sending to electron:", updateData);
+    //   onClose();
+    // } catch (err) {
+    //   setError("Failed to update payment info. Try again.");
+    // }
 
-            // Call Electron API
-            const result = await window.electron.updatePayment(updateData);
-
-            console.log(result)
-
-            if (result.success) {
-                // Prepare data for Redux update (clear unused field)
-                const reduxUpdateData: any = {
-                    paymentMethod: method
-                };
-
-                if (method === "wise") {
-                    reduxUpdateData.wiseEmail = wiseEmail.trim();
-                    reduxUpdateData.veemAccount = ""; // Clear veem
-                } else if (method === "veem") {
-                    reduxUpdateData.veemAccount = veemAccount.trim();
-                    reduxUpdateData.wiseEmail = ""; // Clear wise
-                }
-
-                // Update Redux store
-                dispatch(setProfile(result.data));
-
-                // Show success message if needed
-                // toast.success("Payment method updated successfully");
-
-                onClose();
-            } else {
-                setError(result.message || "Failed to update payment info.");
-            }
-        } catch (err: any) {
-            setError(err.message || "Failed to update payment info. Try again.");
-        } finally {
     setLoading(false);
-        }
   };
 
   return (

src/ui/pages/Settings/Settings.tsx

@@ -104,24 +104,24 @@ const Settings: React.FC = () => {
             </div>
 
 
-            {profile?.veemAccount && (
+            {profile?.paymentMethod === "wise" && (
               <div className="p-2 rounded bg-base-200/40">
                 <p className="text-xs text-base-content/60 flex items-center gap-1 mb-0.5">
-                  🏦 Veem Account
+                  💳 Wise
                 </p>
-                <p className="text-xs font-medium truncate" title={profile?.veemAccount || "N/A"}>
+                <p className="text-xs font-medium truncate" title={profile?.payoneerAccount || "N/A"}>
-                  {profile?.veemAccount || "N/A"}
+                  {maskLast5(profile?.wiseEmail)}
                 </p>
               </div>
             )}
 
-            {profile?.wiseEmail&& (
+            {profile?.paymentMethod === "veem" && (
               <div className="p-2 rounded bg-base-200/40">
                 <p className="text-xs text-base-content/60 flex items-center gap-1 mb-0.5">
-                  🏦 Wise Email
+                  🏦 Veem
                 </p>
-                <p className="text-xs font-medium overflow-auto no-scrollbar" title={profile?.wiseEmail || "N/A"}>
+                <p className="text-xs font-medium truncate" title={profile?.veemAccount || "N/A"}>
-                  {profile?.wiseEmail || "N/A"}
+                  {profile?.veemAccount || "N/A"}
                 </p>
               </div>
             )}

types.d.ts

@@ -193,13 +193,6 @@ interface Window {
       cPassword: string;
     }) => Promise<{ success: boolean; message?: string; data?: any }>;
 
-    // In your electron API handler
-    updatePayment: (data: {
-      paymentMethod: string;
-      wiseEmail?: string;
-      veemAccount?: string;
-    }) => Promise<{ success: boolean; message?: string; data?: any }>;
-
 
     onTokenExpired: (callback: () => void) => void;
 
@@ -241,9 +234,6 @@ interface Window {
       success: boolean;
       data?: any;
     }>;
-
-    connectVPN: () => Promise<string>;
-    disconnectVPN: () => Promise<void>;
   };
 
 }