Merge pull request #483 from bitfinexcom/staging

Release version 4.32.0

.github/workflows/build-electron-app.yml

@@ -161,7 +161,7 @@ jobs:
         fi
     - uses: actions/setup-node@v4
       with:
-        node-version: 18.17.1
+        node-version: 20.18.1
     - name: Cache Electron binaries
       id: electron-cache
       uses: actions/cache@v4
@@ -231,7 +231,7 @@ jobs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18.17.1
+        node-version: 20.18.1
     - name: Install main dev deps
       run: npm i --development --no-audit --progress=false --force
     - name: Download Linux Unpacked build
@@ -263,7 +263,7 @@ jobs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18.17.1
+        node-version: 20.18.1
     - name: Install main dev deps
       run: npm i --development --no-audit --progress=false --force
     - name: Download Linux Unpacked build
@@ -297,7 +297,7 @@ jobs:
       uses: ./.github/actions/prepare-mac-runner
     - uses: actions/setup-node@v4
       with:
-        node-version: 18.17.1
+        node-version: 20.18.1
     - name: Install main dev deps
       run: npm i --development --no-audit --progress=false --force
     - name: Download Mac Unpacked build

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
         submodules: recursive
     - uses: actions/setup-node@v4
       with:
-        node-version: 18.17.1
+        node-version: 20.18.1
     - name: Setup configs and install deps
       run: ./scripts/setup.sh -u
     - name: Run tests

CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.32.0] - 2025-01-22
+
+### Added
+
+- Added the backend logic to move the electron app menu bar to the UI title instead of the electron one so that we can customize the electron menu, as the native electron menu API doesn't provide that. It allows us to build the menu in the UI in one small line with the main app title and typical window buttons (minimize, maximize, and close in the top corner). This is very useful as it saves overall space and at the same time constantly displays the menu and does not require the user to press the `Alt` key to display it (as practice has shown, because of the last one, many inexperienced users do not even know about the existence of menu functions). PRs: [bfx-report-electron#478](https://github.com/bitfinexcom/bfx-report-electron/pull/478), [bfx-facs-db-better-sqlite#11](https://github.com/bitfinexcom/bfx-facs-db-better-sqlite/pull/11)
+- Added a small typical `_` button (in the top right corner) to minimize the loading window. PR: [bfx-report-electron#479](https://github.com/bitfinexcom/bfx-report-electron/pull/479)
+- Added the logout flow for web users and prevented the issue when logged-out users are still logged in after the page refreshing. PR: [bfx-report-ui#889](https://github.com/bitfinexcom/bfx-report-ui/pull/889)
+
+### Changed
+
+- Renamed `Filter` button to `Generate` and also disabled it during the initial synchronization to prevent `Tax Report` generation errors. Implemented corresponding notice for the users during the initial sync. PR: [bfx-report-ui#888](https://github.com/bitfinexcom/bfx-report-ui/pull/888)
+- Actualized app download link generation flow. PR: [bfx-report-ui#890](https://github.com/bitfinexcom/bfx-report-ui/pull/890)
+- Actualized `Reports` translations and extended coverage for newly added elements/features. PR: [bfx-report-ui#891](https://github.com/bitfinexcom/bfx-report-ui/pull/891)
+- Improved theme setting flow and fixed issues noted after the latest `Electron` version update. PR: [bfx-report-ui#893](https://github.com/bitfinexcom/bfx-report-ui/pull/893)
+
+### Fixed
+
+- Fixed `isAuthTokenGenerationError` flag processing in query response for the 2FA re-login after token expiration. PR: [bfx-report-ui#892](https://github.com/bitfinexcom/bfx-report-ui/pull/892)
+
 ## [4.31.0] - 2024-12-04
 
 ### Added

Dockerfile.linux-builder

@@ -1,6 +1,6 @@
-FROM electronuserland/builder:18
+FROM electronuserland/builder:20
 
-ARG NODE_VERSION="18.17.1"
+ARG NODE_VERSION="20.18.1"
 
 ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
 ENV IS_DEV_ENV=${IS_DEV_ENV:-0}

Dockerfile.mac-builder

@@ -1,6 +1,6 @@
-FROM electronuserland/builder:18
+FROM electronuserland/builder:20
 
-ARG NODE_VERSION="18.17.1"
+ARG NODE_VERSION="20.18.1"
 
 ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
 ENV IS_DEV_ENV=${IS_DEV_ENV:-0}

Dockerfile.ui-builder

@@ -1,6 +1,6 @@
-FROM electronuserland/builder:18
+FROM electronuserland/builder:20
 
-ARG NODE_VERSION="18.17.1"
+ARG NODE_VERSION="20.18.1"
 
 ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
 ENV IS_DEV_ENV=${IS_DEV_ENV:-0}

Dockerfile.win-builder

@@ -1,6 +1,6 @@
-FROM electronuserland/builder:18-wine
+FROM electronuserland/builder:20-wine
 
-ARG NODE_VERSION="18.17.1"
+ARG NODE_VERSION="20.18.1"
 
 ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
 ENV IS_DEV_ENV=${IS_DEV_ENV:-0}

build/locales/en/translations.json

@@ -12,10 +12,32 @@
       "quitLabel": "Quit"
     },
     "fileSubMenu": {
-      "label": "File"
+      "label": "File",
+      "closeLabel": "Close",
+      "quitLabel": "Quit"
     },
     "editSubMenu": {
-      "label": "Edit"
+      "label": "Edit",
+      "undoLabel": "Undo",
+      "redoLabel": "Redo",
+      "cutLabel": "Cut",
+      "copyLabel": "Copy",
+      "pasteLabel": "Paste",
+      "pasteAndMatchStyleLabel": "Paste And Match Style",
+      "deleteLabel": "Delete",
+      "selectAllLabel": "Select All",
+      "substitutionsSubMenu": {
+        "label": "Substitutions",
+        "showSubstitutions": "Show Substitutions",
+        "toggleSmartQuotes": "Smart Quotes",
+        "toggleSmartDashes": "Smart Dashes",
+        "toggleTextReplacement": "Text Replacement"
+      },
+      "speechSubMenu": {
+        "label": "Speech",
+        "startSpeakingLabel": "Start Speaking",
+        "stopSpeakingLabel": "Stop Speaking"
+      }
     },
     "viewSubMenu": {
       "label": "View",
@@ -28,7 +50,11 @@
       "togglefullscreenLabel": "Toggle Full Screen"
     },
     "windowSubMenu": {
-      "label": "Window"
+      "label": "Window",
+      "minimizeLabel": "Minimize",
+      "zoomLabel": "Zoom",
+      "frontLabel": "Bring All to Front",
+      "windowLabel": "Window"
     },
     "toolsSubMenu": {
       "label": "Tools",

build/locales/ru/translations.json

@@ -5,17 +5,39 @@
   },
   "menu": {
     "macMainSubmenu": {
-      "servicesLabel": "Услуги",
+      "servicesLabel": "Службы",
       "hideLabel": "Скрыть",
       "hideOthersLabel": "Скрыть Другие",
       "unhideLabel": "Показать",
       "quitLabel": "Выйти"
     },
     "fileSubMenu": {
-      "label": "Файл"
+      "label": "Файл",
+      "closeLabel": "Закрыть",
+      "quitLabel": "Выйти"
     },
     "editSubMenu": {
-      "label": "Редактировать"
+      "label": "Редактировать",
+      "undoLabel": "Отменить",
+      "redoLabel": "Повторить",
+      "cutLabel": "Вырезать",
+      "copyLabel": "Копировать",
+      "pasteLabel": "Вставить",
+      "pasteAndMatchStyleLabel": "Вставить и Сопоставить Стиль",
+      "deleteLabel": "Удалить",
+      "selectAllLabel": "Выбрать Все",
+      "substitutionsSubMenu": {
+        "label": "Подстановки",
+        "showSubstitutions": "Показать Подстановки",
+        "toggleSmartQuotes": "Умные Цитаты",
+        "toggleSmartDashes": "Умные Тире",
+        "toggleTextReplacement": "Замена текста"
+      },
+      "speechSubMenu": {
+        "label": "Речь",
+        "startSpeakingLabel": "Начать Говорить",
+        "stopSpeakingLabel": "Перестать Говорить"
+      }
     },
     "viewSubMenu": {
       "label": "Вид",
@@ -28,7 +50,11 @@
       "togglefullscreenLabel": "Переключить на Полный Экран"
     },
     "windowSubMenu": {
-      "label": "Окно"
+      "label": "Окно",
+      "minimizeLabel": "Свернуть",
+      "zoomLabel": "Увеличить",
+      "frontLabel": "На Передний План",
+      "windowLabel": "Окно"
     },
     "toolsSubMenu": {
       "label": "Инструменты",

electronEnv.json.example

@@ -1,5 +1,6 @@
 {
   "NODE_ENV": "production",
   "IS_AUTO_UPDATE_DISABLED": false,
-  "REPO_OWNER": "bitfinexcom"
+  "REPO_OWNER": "bitfinexcom",
+  "SHOW_NATIVE_TITLE_BAR": true
 }

index.js

@@ -27,6 +27,7 @@ app.setName(productName)
 
 process.traceProcessWarnings = true
 app.allowRendererProcessReuse = true
+process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true
 
 require('./src/error-manager')
   .initLogger()

package.json

@@ -1,12 +1,12 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.31.0",
+  "version": "4.32.0",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",
   "main": "index.js",
   "engine": {
-    "node": ">=18.17.1"
+    "node": ">=20.18.1"
   },
   "license": "Apache-2.0",
   "dependencies": {
@@ -35,18 +35,16 @@
     "yauzl": "3.2.0"
   },
   "devDependencies": {
-    "@mapbox/node-pre-gyp": "1.0.11",
     "@wdio/cli": "8.22.1",
     "@wdio/junit-reporter": "8.21.0",
     "@wdio/local-runner": "8.22.1",
     "@wdio/mocha-framework": "8.22.0",
     "@wdio/spec-reporter": "8.21.0",
-    "app-builder-bin": "4.2.0",
     "concurrently": "9.0.1",
     "cross-env": "7.0.3",
     "dotenv": "16.3.1",
-    "electron": "27.3.11",
-    "electron-builder": "24.10.0",
+    "electron": "33.3.1",
+    "electron-builder": "24.13.3",
     "mocha": "10.2.0",
     "standard": "17.1.0",
     "wdio-electron-service": "5.4.0"

scripts/build-release.sh

@@ -161,11 +161,6 @@ else
     "$ROOT/$ELECTRON_ENV_FILE_NAME"; rm -f "$ROOT/$ELECTRON_ENV_FILE_NAME.bak"
 fi
 
-changeDirOwnershipToCurrUser "$ELECTRON_CACHE" "$(id -u):$(id -g)"
-changeDirOwnershipToCurrUser "$ELECTRON_BUILDER_CACHE" "$(id -u):$(id -g)"
-changeDirOwnershipToCurrUser "$COMMON_UI_BUILD_FOLDER"
-changeDirOwnershipToCurrUser "$COMMON_DIST_FOLDER"
-
 makeLastCommitJson "$ROOT/$LAST_COMMIT_FILE_NAME"
 
 echo -e "\n${COLOR_BLUE}Making backend config files${COLOR_NORMAL}"

scripts/build-ui.sh

@@ -81,8 +81,6 @@ if [ $isDevEnv == 1 ]; then
   export CI_ENVIRONMENT_NAME="development"
 fi
 
-changeDirOwnershipToCurrUser "$COMMON_UI_BUILD_FOLDER"
-
 rm -rf "$UI_BUILD_FOLDER/"*
 
 if [ -d "$COMMON_UI_BUILD_FOLDER" ]; then

scripts/helpers/install-backend-deps.sh

@@ -43,7 +43,7 @@ function installBackendDeps {
   echo -e "\n${COLOR_BLUE}Installing the main dev deps...${COLOR_NORMAL}"
   rm -rf ./node_modules
   npm i --development --no-audit --progress=false --force
-  npm ls --depth=0 --only=dev 1<&-
+  npm ls --depth=0 1<&-
 
   export npm_config_target_platform="$targetPlatform"
   export npm_config_platform="$targetPlatform"
@@ -55,9 +55,9 @@ function installBackendDeps {
   export npm_config_disturl="$DIST_URL"
 
   echo -e "\n${COLOR_BLUE}Installing the main prod deps...${COLOR_NORMAL}"
-  npm i --production --include=dev --no-audit --progress=false --force
+  npm i --omit=dev --include=dev --no-audit --progress=false --force
   checkNodeModulesDir "$ROOT"
-  depsErr=$(npm ls --depth=0 --only=prod 2>&1 >/dev/null | grep -E -v "missing: eslint|--omit=dev" || [[ $? == 1 ]])
+  depsErr=$(npm ls --depth=0 --omit=dev 2>&1 >/dev/null | grep -E -v "missing: eslint" || [[ $? == 1 ]])
   if [ -n "$depsErr" ]; then
     echo -e "$depsErr" >&2
     exit 1
@@ -66,16 +66,16 @@ function installBackendDeps {
   cd "$EXPRESS_FOLDER"
   echo -e "\n${COLOR_BLUE}Installing the prod express deps...${COLOR_NORMAL}"
   rm -rf ./node_modules
-  npm i --production --no-audit --progress=false
+  npm i --omit=dev --no-audit --progress=false
   checkNodeModulesDir "$EXPRESS_FOLDER"
-  npm ls --depth=0 --only=prod 1<&-
+  npm ls --depth=0 --omit=dev 1<&-
 
   cd "$WORKER_FOLDER"
   echo -e "\n${COLOR_BLUE}Installing the prod worker deps...${COLOR_NORMAL}"
   rm -rf ./node_modules
-  npm i --production --no-audit --progress=false
+  npm i --omit=dev --no-audit --progress=false
   checkNodeModulesDir "$WORKER_FOLDER"
-  npm ls --depth=0 --only=prod 1<&-
+  npm ls --depth=0 --omit=dev 1<&-
 
   cd "$INSTALL_BACKEND_CURRDIR"
 }

scripts/helpers/install-nodejs.sh

@@ -13,7 +13,7 @@ script as required NodeJS version!${COLOR_NORMAL}" >&2
   exit 1
 fi
 
-version="${1:-"18.17.1"}"
+version="${1:-"20.18.1"}"
 
 echo -e "\n${COLOR_BLUE}Installing the NodeJS v$version...${COLOR_NORMAL}"
 
@@ -26,6 +26,5 @@ unlink /usr/local/LICENSE
 unlink /usr/local/README.md
 
 npm cache clear --force 2>/dev/null
-npm install --global [email protected]
 
 echo -e "\n${COLOR_GREEN}The NodeJS has been installed successful${COLOR_NORMAL}"

src/app-states.js

@@ -2,5 +2,6 @@
 
 module.exports = {
   isMainWinMaximized: false,
+  isMainWinFullScreen: false,
   loadURL: null
 }