Merge pull request #529 from bitfinexcom/staging

Release version 4.34.1

Author: vigan-abd

CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.34.1] - 2025-04-09
+
+### Added
+
+- Added ability to avoid queuing sync by scheduler if sync is already in progress to prevent redundant sync in case a user has lots of data and sync takes time until the run of the scheduler. PR: [bfx-reports-framework#446](https://github.com/bitfinexcom/bfx-reports-framework/pull/446)
+- Added `Margin trading` and `Derivative` support to the `Tax Report` sources. PR: [bfx-report-ui#909](https://github.com/bitfinexcom/bfx-report-ui/pull/909)
+
+### Changed
+
+- Changed the order of getting the price of the pub trades moving from the end to the start by timestamps to overcome some rare cases. Related to this issue: [bfx-report-electron#493](https://github.com/bitfinexcom/bfx-report-electron/issues/493). PR: [bfx-reports-framework#445](https://github.com/bitfinexcom/bfx-reports-framework/pull/445)
+- Disabled `Average Win/Loss` refresh button during initial synchronization to prevent report generation errors. Added a corresponding notice to communicate this to the user. PR: [bfx-report-ui#916](https://github.com/bitfinexcom/bfx-report-ui/pull/916)
+- Improved derivative currencies formatting (like `ETHF0` -> `ETH (deriv)` etc.) for a more consistent looking and representation. PR: [bfx-report-ui#910](https://github.com/bitfinexcom/bfx-report-ui/pull/910)
+- Improved sync info popup proportions for a better look after the changing used font family. PR: [bfx-report-ui#901](https://github.com/bitfinexcom/bfx-report-ui/pull/901)
+- Disabled `Traded Volume` refresh button during initial synchronization to prevent report generation errors. Added a corresponding notice to communicate this to the user. PR: [bfx-report-ui#906](https://github.com/bitfinexcom/bfx-report-ui/pull/906)
+
+### Fixed
+
+- Fixed `auto-update-toast:width` listener by adding `uid` to define `alert` instance and ajusts toast position and theme colors. Related to this issue: [bfx-report-electron#526](https://github.com/bitfinexcom/bfx-report-electron/issues/526). PR: [bfx-report-electron#527](https://github.com/bitfinexcom/bfx-report-electron/pull/527)
+- Fixed query builder for `null` operator for sub-query. PR: [bfx-reports-framework#444](https://github.com/bitfinexcom/bfx-reports-framework/pull/444)
+- Prevented `getLastFinishedSyncMts` requests and sync progress checking after the logout to avoid auth errors. PR: [bfx-report-ui#917](https://github.com/bitfinexcom/bfx-report-ui/pull/917)
+- Fixed the `Electron` menu functionality to be available before login. PR: [bfx-report-ui#907](https://github.com/bitfinexcom/bfx-report-ui/pull/907)
+
 ## [4.34.0] - 2025-03-26
 
 ### Added

bfx-report-ui

@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.34.0",
+  "version": "4.34.1",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",

bfx-reports-framework

@@ -13,6 +13,8 @@ const Alert = require('electron-alert')
 const yaml = require('js-yaml')
 const i18next = require('i18next')
 
+const isMac = process.platform === 'darwin'
+
 const log = require('../error-manager/log')
 const BfxMacUpdater = require('./bfx.mac.updater')
 const wins = require('../window-creators/windows')
@@ -77,6 +79,16 @@ const _sendProgress = (progress) => {
     progress
   )
 }
+const _sendUid = (alert) => {
+  if (!alert?.uid) {
+    return
+  }
+
+  alert?.browserWindow?.webContents.send(
+    'auto-update-toast:uid',
+    alert.uid
+  )
+}
 
 const _fireToast = (
   opts = {},
@@ -113,12 +125,16 @@ const _fireToast = (
     })
   }
   const autoUpdateToastRepositionHandler = () => {
+    const macOffset = wins.mainWindow?.isFullScreen()
+      ? 0
+      : 28
+    const heightOffset = isMac ? macOffset : 40
     const { x, y, width } = win.getContentBounds()
     const { width: alWidth } = alert.browserWindow.getContentBounds()
 
     const boundsOpts = {
       x: (x + width) - alWidth,
-      y,
+      y: y + heightOffset,
       height
     }
 
@@ -127,11 +143,11 @@ const _fireToast = (
 
   const bwOptions = {
     frame: false,
-    transparent: false,
+    transparent: true,
     thickFrame: false,
     closable: false,
     hasShadow: false,
-    backgroundColor: ThemeIpcChannelHandlers.getWindowBackgroundColor(),
+    backgroundColor: ThemeIpcChannelHandlers.getWindowTitleBackgroundColor(),
     darkTheme: false,
     height,
     width: opts?.width ?? 1000,
@@ -185,11 +201,11 @@ const _fireToast = (
     didClose: () => {
       eventHandlerCtx.removeListener()
       ipcMain.removeListener(
-        'auto-update-toast:width',
+        `${alert.uid}auto-update-toast:width`,
         autoUpdateToastWidthHandler
       )
       ipcMain.removeListener(
-        alert.uid + 'reposition',
+        `${alert.uid}reposition`,
         autoUpdateToastRepositionHandler
       )
 
@@ -206,8 +222,9 @@ const _fireToast = (
     sound
   )
 
-  ipcMain.on('auto-update-toast:width', autoUpdateToastWidthHandler)
-  ipcMain.on(alert.uid + 'reposition', autoUpdateToastRepositionHandler)
+  _sendUid(alert)
+  ipcMain.on(`${alert.uid}auto-update-toast:width`, autoUpdateToastWidthHandler)
+  ipcMain.on(`${alert.uid}reposition`, autoUpdateToastRepositionHandler)
 
   return res
 }

package-lock.json

@@ -1,5 +1,5 @@
 html, body {
-  background-color: var(--bgColor, #172d3e);
+  background-color: var(--bgColor2, #0B1923);
 }
 
 .swal2-container.swal2-backdrop-show,
@@ -40,7 +40,7 @@ body.swal2-toast-shown .swal2-container {
   justify-content: space-between;
   align-items: center;
   box-sizing: content-box;
-  background-color: var(--bgColor, #172d3e);
+  background-color: var(--bgColor2, #0B1923);
   overflow: revert;
 }
 
@@ -100,7 +100,7 @@ body.swal2-toast-shown .swal2-container {
 
 .swal2-styled.swal2-cancel {
   border-radius: 2px;
-  background-color: var(--bgColor, #172d3e);
+  background-color: var(--bgColor2, #0B1923);
   border: 1px solid var(--borderColor, #334A59);
   color: var(--btnColor, #ffffff);
   box-shadow: none;

package.json

@@ -1,9 +1,14 @@
 'use strict'
 
+const { ipcRenderer } = require('electron')
+let uid = ''
+
+ipcRenderer.once('auto-update-toast:uid', (event, autoUpdateUid) => {
+  uid = autoUpdateUid
+})
+
 window.addEventListener('load', () => {
   try {
-    const { ipcRenderer } = require('electron')
-
     const container = document.body
     const processWrapper = document.createElement('div')
     const htmlContainers = document.getElementsByClassName('swal2-popup')
@@ -64,7 +69,7 @@ window.addEventListener('load', () => {
       )
     }
 
-    ipcRenderer.send('auto-update-toast:width', { width })
+    ipcRenderer.send(`${uid}auto-update-toast:width`, { width })
   } catch (err) {
     console.error(err)
   }

src/auto-updater/index.js

@@ -251,8 +251,10 @@ const createMainWindow = async ({
     : {
         titleBarOverlay: {
           height: 40,
-          color: '#0b1923ff',
-          symbolColor: '#fff'
+          color: ThemeIpcChannelHandlers.getWindowTitleBackgroundColor(),
+          symbolColor: ThemeIpcChannelHandlers.getWindowTitleBackgroundColor(
+            { isSymbolColor: true }
+          )
         }
       }
   const titleBarOpts = showNativeTitleBar

src/auto-updater/toast-src/toast.css

@@ -7,6 +7,7 @@ const IpcChannelHandlers = require('./ipc.channel.handlers')
 const { getConfigsKeeperByName } = require('../../configs-keeper')
 const wins = require('../windows')
 const isMainWinAvailable = require('../../helpers/is-main-win-available')
+const isMac = process.platform === 'darwin'
 
 class ThemeIpcChannelHandlers extends IpcChannelHandlers {
   static channelName = 'theme'
@@ -22,6 +23,11 @@ class ThemeIpcChannelHandlers extends IpcChannelHandlers {
     DARK: '#172d3e'
   }
 
+  static WINDOW_TITLE_BACKGROUND_COLORS = {
+    LIGHT: '#d8ecfb',
+    DARK: '#0B1923'
+  }
+
   async setThemeHandler (event, args) {
     const {
       isSystemTheme,
@@ -68,6 +74,20 @@ class ThemeIpcChannelHandlers extends IpcChannelHandlers {
     return this.WINDOW_BACKGROUND_COLORS.LIGHT
   }
 
+  static getWindowTitleBackgroundColor (opts) {
+    const { isSymbolColor } = opts ?? {}
+
+    if (nativeTheme.shouldUseDarkColors) {
+      return isSymbolColor
+        ? this.WINDOW_TITLE_BACKGROUND_COLORS.LIGHT
+        : this.WINDOW_TITLE_BACKGROUND_COLORS.DARK
+    }
+
+    return isSymbolColor
+      ? this.WINDOW_TITLE_BACKGROUND_COLORS.DARK
+      : this.WINDOW_TITLE_BACKGROUND_COLORS.LIGHT
+  }
+
   static isThemeAllowed (theme) {
     return Object.values(this.THEME_SOURCES)
       .some((item) => item === theme)
@@ -79,6 +99,10 @@ class ThemeIpcChannelHandlers extends IpcChannelHandlers {
       : this.THEME_SOURCES.SYSTEM
 
     const winBgColor = this.getWindowBackgroundColor()
+    const winTitleBgColor = this.getWindowTitleBackgroundColor()
+    const winTitleSymbolColor = this.getWindowTitleBackgroundColor(
+      { isSymbolColor: true }
+    )
 
     for (const win of Object.values(wins)) {
       if (!isMainWinAvailable(win)) {
@@ -87,6 +111,15 @@ class ThemeIpcChannelHandlers extends IpcChannelHandlers {
 
       win.setBackgroundColor(winBgColor)
     }
+
+    if (isMac) {
+      return
+    }
+
+    wins?.mainWindow?.setTitleBarOverlay({
+      color: winTitleBgColor,
+      symbolColor: winTitleSymbolColor
+    })
   }
 
   async #saveTheme (theme) {