Merge pull request #574 from bitfinexcom/staging

Release version 4.40.0

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.40.0] - 2025-12-17
+
+### Added
+
+- Implemented its own solution for alert windows for the electron app instead of the `electron-alert` lib usage for cases where we can't delegate alert maintenance to the main UI. PR: [bfx-report-electron#572](https://github.com/bitfinexcom/bfx-report-electron/pull/572)
+- Added `USDT0 (Plasma)` and `USDT0 (Polygon)` support in the `Symbol` filters and enhanced mapping flow to show all `active` currencies (even not presented in pairs) instead of the fixed exception list. PR: [bfx-report-ui#992](https://github.com/bitfinexcom/bfx-report-ui/pull/992)
+- Implemented `mtsUpdated` value representation in the `Updated At` column for the `Movements` report and also added this column support to the filters. PR: [bfx-report-ui#995](https://github.com/bitfinexcom/bfx-report-ui/pull/995)
+
+### Changed
+
+- Moved report emailing from `rest:ext:sendgrid` to `rest:core:mail` service. PRs: [bfx-report#456](https://github.com/bitfinexcom/bfx-report/pull/456), [bfx-report#457](https://github.com/bitfinexcom/bfx-report/pull/457)
+- Excluded 2FA login and password from the error report modal window for the electron app in case the bfx api is not available. PR: [bfx-report#458](https://github.com/bitfinexcom/bfx-report/pull/458)
+- Prevented changing params possibility (and related auto-refresh) during the initial sync for the complex reports that require synced data for calculation to avoid generation errors. PR: [bfx-report-ui#994](https://github.com/bitfinexcom/bfx-report-ui/pull/994)
+- Prevented `authToken` from being removed from the `URL` if it was available initially after the redirection, according to the specialized needs of the `Customer` Support team. PR: [bfx-report-ui#996](https://github.com/bitfinexcom/bfx-report-ui/pull/996)
+- Changed column filter title from `Columns` to `Columns Filter` for more clarity to the users. PR: [bfx-report-ui#997](https://github.com/bitfinexcom/bfx-report-ui/pull/997)
+- Removed fees sections from the web and app `Summary` due to deprecation. PR: [bfx-report-ui#998](https://github.com/bitfinexcom/bfx-report-ui/pull/998)
+
+### Fixed
+
+- Excluded current value from language dropdown. PR: [bfx-report-ui#991](https://github.com/bitfinexcom/bfx-report-ui/pull/991)
+- Fixed currently selected language displaying issue noted after the recent updates. PR: [bfx-report-ui#993](https://github.com/bitfinexcom/bfx-report-ui/pull/993)
+
 ## [4.39.0] - 2025-11-19
 
 ### Added

bfx-report-ui

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

bfx-reports-framework

@@ -1,55 +1,17 @@
 'use strict'
 
-const { app, dialog, screen } = require('electron')
-const fs = require('fs')
-const path = require('path')
+const { app, dialog } = require('electron')
 const { Converter } = require('showdown')
-const Alert = require('electron-alert')
-const { rootPath } = require('electron-root-path')
 const i18next = require('i18next')
 
+const {
+  createModalWindow
+} = require('../window-creators')
 const wins = require('../window-creators/windows')
 const spawn = require('../helpers/spawn')
-const getAlertCustomClassObj = require(
-  '../helpers/get-alert-custom-class-obj'
-)
 const isMainWinAvailable = require(
   '../helpers/is-main-win-available'
 )
-const {
-  closeAlert
-} = require('../modal-dialog-src/utils')
-const {
-  WINDOW_EVENT_NAMES,
-  addOnceProcEventHandler
-} = require('../window-creators/window-event-manager')
-const getUIFontsAsCSSString = require(
-  '../helpers/get-ui-fonts-as-css-string'
-)
-const ThemeIpcChannelHandlers = require(
-  '../window-creators/main-renderer-ipc-bridge/theme-ipc-channel-handlers'
-)
-
-const mdStyle = fs.readFileSync(path.join(
-  rootPath, 'node_modules', 'github-markdown-css/github-markdown.css'
-))
-const fontsStyle = getUIFontsAsCSSString()
-const themesStyle = fs.readFileSync(path.join(
-  __dirname, '../window-creators/layouts/themes.css'
-))
-const alertStyle = fs.readFileSync(path.join(
-  __dirname, '../modal-dialog-src/modal-dialog.css'
-))
-const alertScript = fs.readFileSync(path.join(
-  __dirname, '../modal-dialog-src/modal-dialog.js'
-))
-
-const fonts = `<style>${fontsStyle}</style>`
-const themes = `<style>${themesStyle}</style>`
-const mdS = `<style>${mdStyle}</style>`
-const style = `<style>${alertStyle}</style>`
-const script = `<script type="text/javascript">${alertScript}</script>`
-const sound = { freq: 'F2', type: 'triange', duration: 1.5 }
 
 const converter = new Converter({
   tables: true,
@@ -59,120 +21,26 @@ const converter = new Converter({
   requireSpaceBeforeHeadingText: true
 })
 
-const _fireAlert = (params) => {
+const _fireAlert = async (params) => {
   const {
     title = i18next.t('errorManager.errorModalDialog.title'),
     html = '',
-    parentWin,
     hasNoParentWin
   } = params ?? {}
-  const win = parentWin ?? wins.mainWindow
 
-  if (
-    !hasNoParentWin &&
-    !isMainWinAvailable(win)
-  ) {
-    return { value: false }
-  }
-
-  const {
-    getCursorScreenPoint,
-    getDisplayNearestPoint
-  } = screen
-  const {
-    workArea
-  } = getDisplayNearestPoint(getCursorScreenPoint())
-  const { height: screenHeight } = workArea
-  const maxHeight = Math.floor(screenHeight * 0.90)
-
-  const alert = new Alert([mdS, fonts, themes, style, script])
-
-  const eventHandlerCtx = addOnceProcEventHandler(
-    WINDOW_EVENT_NAMES.CLOSED,
-    () => closeAlert(alert),
-    win
-  )
-
-  const bwOptions = {
-    frame: false,
-    transparent: false,
-    thickFrame: false,
-    closable: false,
-    hasShadow: false,
-    backgroundColor: ThemeIpcChannelHandlers.getWindowBackgroundColor(),
-    darkTheme: false,
-    parent: win,
-    modal: true,
-    width: 600,
-    webPreferences: {
-      contextIsolation: false
-    }
-  }
-  const swalOptions = {
-    position: 'center',
-    allowOutsideClick: false,
-    customClass: getAlertCustomClassObj({
-      htmlContainer: 'markdown-body'
-    }),
-
-    icon: 'question',
-    focusConfirm: true,
+  const res = await createModalWindow({
+    icon: 'error',
+    title,
+    text: html,
+    textClassName: 'markdown-body',
     showConfirmButton: true,
-    confirmButtonText: i18next.t('errorManager.errorModalDialog.confirmButtonText'),
+    confirmButtonText: i18next
+      .t('errorManager.errorModalDialog.confirmButtonText'),
     showCancelButton: true,
-    cancelButtonText: i18next.t('common.cancelButtonText'),
-    timerProgressBar: false,
-
-    ...params,
-    title,
-    html,
-
-    willOpen: () => {
-      if (
-        !alert ||
-        !alert.browserWindow
-      ) return
+    cancelButtonText: i18next.t('common.cancelButtonText')
+  }, { hasNoParentWin, height: 600 })
 
-      alert.browserWindow.hide()
-    },
-    didOpen: () => {
-      if (
-        !alert ||
-        !alert.browserWindow
-      ) return
-
-      alert.browserWindow.show()
-      const { height } = alert.browserWindow
-        .getContentBounds()
-      alert.browserWindow.setBounds({
-        height: height > maxHeight
-          ? maxHeight
-          : height
-      })
-    },
-    willClose: () => {
-      if (
-        !alert ||
-        !alert.browserWindow
-      ) return
-
-      alert.browserWindow.hide()
-    },
-    didClose: () => {
-      eventHandlerCtx.removeListener()
-    }
-  }
-
-  const res = alert.fire(
-    swalOptions,
-    bwOptions,
-    null,
-    true,
-    false,
-    sound
-  )
-
-  return res
+  return res?.modalRes ?? {}
 }
 
 module.exports = async (params) => {
@@ -207,13 +75,11 @@ module.exports = async (params) => {
   ) {
     const html = converter.makeHtml(mdIssue)
 
-    const {
-      value
-    } = await _fireAlert({ html, ...alertOpts })
+    const res = await _fireAlert({ html, ...alertOpts })
 
     return {
       isExit: false,
-      isReported: value
+      isReported: res?.dismiss === 'confirm'
     }
   }
 

package-lock.json

@@ -21,6 +21,9 @@ const ThemeIpcChannelHandlers = require(
 const AutoUpdateIpcChannelHandlers = require(
   './window-creators/main-renderer-ipc-bridge/auto-update-ipc-channel-handlers'
 )
+const ModalIpcChannelHandlers = require(
+  './window-creators/main-renderer-ipc-bridge/modal-ipc-channel-handlers'
+)
 const triggerSyncAfterUpdates = require('./trigger-sync-after-updates')
 const triggerElectronLoad = require('./trigger-electron-load')
 const runServer = require('./run-server')
@@ -168,7 +171,8 @@ module.exports = async () => {
       TranslationIpcChannelHandlers,
       MenuIpcChannelHandlers,
       ThemeIpcChannelHandlers,
-      AutoUpdateIpcChannelHandlers
+      AutoUpdateIpcChannelHandlers,
+      ModalIpcChannelHandlers
     )
 
     app.disableHardwareAcceleration()