fix: prevent Transak window from showing on top of popups (#1720)

Co-authored-by: Tuditi <[email protected]>
bloomwalletio · Jan 19, 2024 · 1a5deb0 · 1a5deb0
1 parent ab12751
commit 1a5deb0
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 1 deletion.
diff --git a/packages/desktop/lib/electron/apis/electron.api.ts b/packages/desktop/lib/electron/apis/electron.api.ts
@@ -256,6 +256,12 @@ export default {
     closeTransak(): Promise<void> {
         return ipcRenderer.invoke('close-transak')
     },
+    minimizeTransak(): Promise<void> {
+        return ipcRenderer.invoke('minimize-transak')
+    },
+    restoreTransak(): Promise<void> {
+        return ipcRenderer.invoke('restore-transak')
+    },
     isSidebarExpanded(expanded: boolean): Promise<void> {
         return ipcRenderer.invoke('is-sidebar-expanded', expanded)
     },

diff --git a/packages/desktop/lib/electron/managers/transak.manager.ts b/packages/desktop/lib/electron/managers/transak.manager.ts
@@ -31,6 +31,14 @@ export default class TransakManager implements ITransakManager {
         }
     }
 
+    public minimizeWindow(): void {
+        windows.transak?.minimize()
+    }
+
+    public restoreWindow(): void {
+        windows.transak?.restore()
+    }
+
     public openWindow(data: ITransakWindowData): BrowserWindow {
         if (windows.transak !== null) {
             return windows.transak

diff --git a/packages/desktop/lib/electron/processes/main.process.ts b/packages/desktop/lib/electron/processes/main.process.ts
@@ -524,6 +524,14 @@ ipcMain.handle('is-sidebar-expanded', (_, expanded) => {
     }
 })
 
+ipcMain.handle('minimize-transak', () => {
+    transakManager?.minimizeWindow()
+})
+
+ipcMain.handle('restore-transak', () => {
+    transakManager?.restoreWindow()
+})
+
 /**
  * Create about window
  * @returns {BrowserWindow} About window

diff --git a/packages/desktop/views/dashboard/buy-sell/views/BuySellMainView.svelte b/packages/desktop/views/dashboard/buy-sell/views/BuySellMainView.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
     import { Icon, IconName, Text } from '@bloomwalletio/ui'
     import { AccountSwitcher, FormattedBalance } from '@components'
+    import { ISettingsState, settingsState } from '@contexts/settings/stores'
     import { selectedAccount, selectedAccountIndex } from '@core/account/stores'
     import { Platform } from '@core/app'
     import { formatCurrency } from '@core/i18n'
     import { getFiatAmountFromTokenValue } from '@core/market/actions'
     import { activeProfile } from '@core/profile/stores'
     import { ITokenWithBalance, formatTokenAmountBestMatch } from '@core/token'
     import { selectedAccountTokens } from '@core/token/stores'
+    import { IPopupState, IProfileAuthPopupState, popupState, profileAuthPopup } from '@desktop/auxiliary/popup'
     import { Pane } from '@ui'
-    import { onDestroy } from 'svelte'
+    import { onDestroy, tick } from 'svelte'
 
     let tokenBalance: string
     let fiatBalance: string
@@ -35,6 +37,20 @@
         void resetTransak()
     }
 
+    $: void handlePopupState($popupState, $profileAuthPopup, $settingsState)
+    async function handlePopupState(
+        state: IPopupState,
+        profilePopupState: IProfileAuthPopupState,
+        settingsState: ISettingsState
+    ): Promise<void> {
+        if (state.active || profilePopupState.active || settingsState.open) {
+            await Platform.minimizeTransak()
+        } else {
+            await tick()
+            await Platform.restoreTransak()
+        }
+    }
+
     onDestroy(() => {
         void Platform.closeTransak()
     })

diff --git a/packages/shared/src/lib/core/app/interfaces/managers/transak-manager.interface.ts b/packages/shared/src/lib/core/app/interfaces/managers/transak-manager.interface.ts
@@ -3,6 +3,8 @@ import { ITransakWindowData } from '../transak-window-data.interface'
 export interface ITransakManager {
     openWindow(data: ITransakWindowData): void
     closeWindow(): void
+    minimizeWindow(): void
+    restoreWindow(): void
     positionWindow(): void
     setSidebarExpanded(expanded: boolean): void
 }
diff --git a/packages/shared/src/lib/core/app/interfaces/platform.interface.ts b/packages/shared/src/lib/core/app/interfaces/platform.interface.ts
@@ -65,6 +65,8 @@ export interface IPlatform {
 
     openTransak(data: ITransakWindowData): Promise<void>
     closeTransak(): Promise<void>
+    minimizeTransak(): Promise<void>
+    restoreTransak(): Promise<void>
 
     isSidebarExpanded(expanded: boolean): Promise<void>
 }
diff --git a/packages/shared/test/mocks/platform.mock.ts b/packages/shared/test/mocks/platform.mock.ts
@@ -109,6 +109,12 @@ const Platform: IPlatform = {
     closeTransak(): Promise<void> {
         return Promise.resolve()
     },
+    minimizeTransak(): Promise<void> {
+        return Promise.resolve()
+    },
+    restoreTransak(): Promise<void> {
+        return Promise.resolve()
+    },
     isSidebarExpanded(expanded: boolean): Promise<void> {
         return Promise.resolve()
     },