Merge pull request #421 from bitfinexcom/staging

Release version 4.29.0

.env.example

@@ -1,8 +1,12 @@
 REPO_OWNER=bitfinexcom
 REPO_BRANCH=master
+
 IS_BFX_API_STAGING=0
 IS_DEV_ENV=0
 IS_AUTO_UPDATE_DISABLED=0
+
+SHOULD_LOCALHOST_BE_USED_FOR_LOADING_UI_IN_DEV_MODE=0
+
 EP_GH_IGNORE_TIME=true
 GH_TOKEN=
 

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

@@ -128,7 +128,7 @@ jobs:
 
   mac-builder:
     timeout-minutes: 150
-    runs-on: macos-12
+    runs-on: macos-15
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -292,7 +292,7 @@ jobs:
   mac-e2e-test-runner:
     name: Mac E2E Test Runner
     timeout-minutes: 30
-    runs-on: macos-12
+    runs-on: macos-15
     needs: [mac-builder]
     steps:
     - name: Checkout

CHANGELOG.md

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.29.0] - 2024-10-16
+
+### Added
+
+- Implemented `Active Positions` section on the app `Summary` page. PR: [bfx-report-ui#873](https://github.com/bitfinexcom/bfx-report-ui/pull/873)
+- Added `Active Positions` section to the web `Account Summary` page. PR: [bfx-report-ui#874](https://github.com/bitfinexcom/bfx-report-ui/pull/874)
+- Improved `fallback` languages for i18next https://www.i18next.com/principles/fallback. PR: [bfx-report#406](https://github.com/bitfinexcom/bfx-report/pull/406)
+- Added translation flow to electronjs wrapper. PR: [bfx-report-electron#412](https://github.com/bitfinexcom/bfx-report-electron/pull/412)
+
+### Changed
+
+- Reworked `ColumnsSelectDialog` in a more performant way and improved props linting. PR: [bfx-report-ui#868](https://github.com/bitfinexcom/bfx-report-ui/pull/868)
+- Moved `Account Fees` below other sections on the app `Summary` page. PR: [bfx-report-ui#871](https://github.com/bitfinexcom/bfx-report-ui/pull/871)
+- Reworked and optimized the `Account Balance` section in a more performant way and reduced redundant code. PR: [bfx-report-ui#872](https://github.com/bitfinexcom/bfx-report-ui/pull/872)
+- Actualized assets section title/subtitle on the `Summary` page, improved currencies formatting. PR: [bfx-report-ui#875](https://github.com/bitfinexcom/bfx-report-ui/pull/875)
+- Improved fetching `opened positions` for the ending point of the `balance` report. PR: [bfx-reports-framework#421](https://github.com/bitfinexcom/bfx-reports-framework/pull/421)
+- Moved window modules into the common folder. This small refactoring is part of adding translation support into the electronjs wrapper. PR: [bfx-report-electron#410](https://github.com/bitfinexcom/bfx-report-electron/pull/410)
+
+### Fixed
+
+- Fixed `opened positions` consideration in `balances` and `win/loss` reports. PR: [bfx-reports-framework#420](https://github.com/bitfinexcom/bfx-reports-framework/pull/420)
+- Updated `macOS` on `GH Actions` from `12` to `15` due to caught warning on the last release: https://github.com/bitfinexcom/bfx-report-electron/actions/runs/11010191592. PR: [bfx-report-electron#413](https://github.com/bitfinexcom/bfx-report-electron/pull/413)
+- Fixed `dotenv` importing for `prod` env. PR: [bfx-report-electron#414](https://github.com/bitfinexcom/bfx-report-electron/pull/414)
+- Fixed `Docker` container preparation for release building. PR: [bfx-report-electron#417](https://github.com/bitfinexcom/bfx-report-electron/pull/417)
+
+### Security
+
+- Bumped `rollup` from `2.79.1` to `2.79.2`. PR: [bfx-report-ui#870](https://github.com/bitfinexcom/bfx-report-ui/pull/870)
+- Bumped `express` from `4.18.2` to `4.21.0`, `ws` from `8.2.3` to `8.18.0`, `grenache-nodejs-http` from `0.7.12` to `0.7.13`, `grenache-nodejs-link` from `0.7.12` to `1.0.0`. PR: [bfx-report-express#42](https://github.com/bitfinexcom/bfx-report-express/pull/42)
+
 ## [4.28.0] - 2024-09-25
 
 ### Added

build/locales/en/translations.json

@@ -0,0 +1,56 @@
+{
+  "common": {
+    "title": "Report"
+  },
+  "menu": {
+    "macMainSubmenu": {
+      "servicesLabel": "Services",
+      "hideLabel": "Hide",
+      "hideOthersLabel": "Hide Others",
+      "unhideLabel": "Unhide",
+      "quitLabel": "Quit"
+    },
+    "fileSubMenu": {
+      "label": "File"
+    },
+    "editSubMenu": {
+      "label": "Edit"
+    },
+    "viewSubMenu": {
+      "label": "View",
+      "reloadLabel": "Reload",
+      "forceReloadLabel": "Force Reload",
+      "toggleDevToolsLabel": "Toggle Developer Tools",
+      "resetZoomLabel": "Actual Size",
+      "zoomInLabel": "Zoom In",
+      "zoomOutLabel": "Zoom Out",
+      "togglefullscreenLabel": "Toggle Full Screen"
+    },
+    "windowSubMenu": {
+      "label": "Window"
+    },
+    "toolsSubMenu": {
+      "label": "Tools",
+      "dataManagementSubMenu": {
+        "label": "Data Management",
+        "exportDbLabel": "Export DB",
+        "importDbLabel": "Import DB",
+        "restoreDbLabel": "Restore DB",
+        "backupDbLabel": "Backup DB",
+        "removeDbLabel": "Remove DB",
+        "clearAllDataLabel": "Clear All Data (except user creds)"
+      },
+      "changeReportsFolderLabel": "Change Reports Folder",
+      "changeSyncFrequencyLabel": "Change Sync Frequency"
+    },
+    "helpSubMenu": {
+      "label": "Help",
+      "openNewGitHubIssueLabel": "Open new GitHub Issue",
+      "checkForUpdatesLabel": "Check for Updates",
+      "quitAndInstallUpdatesLabel": "Quit and Install updates",
+      "userManualLabel": "User Manual",
+      "changelogLabel": "Changelog",
+      "aboutLabel": "About {{appName}}"
+    }
+  }
+}

build/locales/es-EM/translations.json

@@ -0,0 +1,5 @@
+{
+  "common": {
+    "title": "Reporte"
+  }
+}

build/locales/pt-BR/translations.json

@@ -0,0 +1,5 @@
+{
+  "common": {
+    "title": "Informes"
+  }
+}

build/locales/ru/translations.json

@@ -0,0 +1,56 @@
+{
+  "common": {
+    "title": "Отчет"
+  },
+  "menu": {
+    "macMainSubmenu": {
+      "servicesLabel": "Услуги",
+      "hideLabel": "Скрыть",
+      "hideOthersLabel": "Скрыть Другие",
+      "unhideLabel": "Показать",
+      "quitLabel": "Выйти"
+    },
+    "fileSubMenu": {
+      "label": "Файл"
+    },
+    "editSubMenu": {
+      "label": "Редактировать"
+    },
+    "viewSubMenu": {
+      "label": "Вид",
+      "reloadLabel": "Перезагрузить",
+      "forceReloadLabel": "Принудительно Перезагрузить",
+      "toggleDevToolsLabel": "Переключить Инструменты Разработчика",
+      "resetZoomLabel": "Фактический Размер",
+      "zoomInLabel": "Увеличить",
+      "zoomOutLabel": "Уменьшить",
+      "togglefullscreenLabel": "Переключить на Полный Экран"
+    },
+    "windowSubMenu": {
+      "label": "Окно"
+    },
+    "toolsSubMenu": {
+      "label": "Инструменты",
+      "dataManagementSubMenu": {
+        "label": "Управление Данными",
+        "exportDbLabel": "Экспортировать БД",
+        "importDbLabel": "Импортировать БД",
+        "restoreDbLabel": "Восстановить БД",
+        "backupDbLabel": "Резервная копия БД",
+        "removeDbLabel": "Удалить БД",
+        "clearAllDataLabel": "Очистить Все Данные (кроме учетных данных польз.)"
+      },
+      "changeReportsFolderLabel": "Изменить Папку Отчетов",
+      "changeSyncFrequencyLabel": "Изменить Частоту Синхронизации"
+    },
+    "helpSubMenu": {
+      "label": "Помощь",
+      "openNewGitHubIssueLabel": "Открыть новую Проблему на GitHub",
+      "checkForUpdatesLabel": "Проверить наличие Обновлений",
+      "quitAndInstallUpdatesLabel": "Выйти и Установить обновления",
+      "userManualLabel": "Руководство Пользователя",
+      "changelogLabel": "Журнал Изменений",
+      "aboutLabel": "О {{appName}}"
+    }
+  }
+}

build/locales/tr/translations.json

@@ -0,0 +1,5 @@
+{
+  "common": {
+    "title": "Rapor"
+  }
+}

build/locales/vi/translations.json

@@ -0,0 +1,5 @@
+{
+  "common": {
+    "title": "Báo cáo"
+  }
+}

build/locales/zh-CN/translations.json

@@ -0,0 +1,5 @@
+{
+  "common": {
+    "title": "报告"
+  }
+}

build/locales/zh-TW/translations.json

@@ -0,0 +1,5 @@
+{
+  "common": {
+    "title": "報告"
+  }
+}

electron-builder-config.js

@@ -1,6 +1,9 @@
 'use strict'
 
-require('dotenv').config()
+try {
+  require('dotenv').config()
+} catch (err) {}
+
 const fs = require('fs')
 const path = require('path')
 const zlib = require('zlib')
@@ -185,6 +188,7 @@ module.exports = {
   files: [
     '**/*',
     'build/icons',
+    'build/locales',
     'build/icon.*',
     'build/loader.*',
     '!scripts${/*}',

index.js

@@ -13,6 +13,8 @@ try {
 } catch (err) {}
 
 const { app } = require('electron')
+require('./src/i18next')
+  .initI18next()
 
 const isTestEnv = process.env.NODE_ENV === 'test'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.28.0",
+  "version": "4.29.0",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",
@@ -17,7 +17,6 @@
     "clean-stack": "3.0.1",
     "compare-versions": "4.1.1",
     "cron-validate": "1.4.3",
-    "ed25519-supercop": "2.0.1",
     "electron-alert": "0.1.20",
     "electron-log": "4.4.8",
     "electron-root-path": "1.0.16",
@@ -26,6 +25,8 @@
     "get-port": "7.0.0",
     "github-markdown-css": "5.1.0",
     "grenache-grape": "git+https://github.com/bitfinexcom/grenache-grape.git",
+    "i18next": "23.15.1",
+    "i18next-fs-backend": "2.3.2",
     "js-yaml": "4.1.0",
     "lib-js-util-base": "git+https://github.com/bitfinexcom/lib-js-util-base.git",
     "new-github-issue-url": "0.2.1",
@@ -41,6 +42,7 @@
     "@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.5",
@@ -59,11 +61,13 @@
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development DEBUG=* electron .",
+    "startWithUIOnPort": "concurrently -ki -c green,blue -n UI,ELECTRON \"npm run startUI\" \"cross-env NODE_ENV=development DEBUG=* SHOULD_LOCALHOST_BE_USED_FOR_LOADING_UI_IN_DEV_MODE=1 electron .\"",
     "test": "standard && npm run unit",
     "unit": "cross-env NODE_ENV=test mocha './src/**/__test__/*.spec.js' --config .mocharc.json",
     "setup": "./scripts/setup.sh",
     "launch": "./scripts/launch.sh",
     "sync-repo": "./scripts/sync-repo.sh",
-    "e2e": "cross-env NODE_ENV=test wdio run ./wdio.conf.js"
+    "e2e": "cross-env NODE_ENV=test wdio run ./wdio.conf.js",
+    "startUI": "cd bfx-report-ui && cross-env BROWSER=none npm start"
   }
 }

scripts/helpers/install-backend-deps.sh

@@ -56,7 +56,6 @@ function installBackendDeps {
 
   echo -e "\n${COLOR_BLUE}Installing the main prod deps...${COLOR_NORMAL}"
   npm i --production --include=dev --no-audit --progress=false --force
-  rm -rf "$ROOT/node_modules/ed25519-supercop/build"
   checkNodeModulesDir "$ROOT"
   depsErr=$(npm ls --depth=0 --only=prod 2>&1 >/dev/null | grep -E -v "missing: eslint|--omit=dev" || [[ $? == 1 ]])
   if [ -n "$depsErr" ]; then

scripts/helpers/install-nodejs.sh

@@ -25,7 +25,7 @@ unlink /usr/local/CHANGELOG.md
 unlink /usr/local/LICENSE
 unlink /usr/local/README.md
 
-npm cache clear --force
+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/auto-updater/index.js

@@ -14,19 +14,19 @@ const yaml = require('js-yaml')
 
 const log = require('../error-manager/log')
 const BfxMacUpdater = require('./bfx.mac.updater')
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const {
   showLoadingWindow,
   hideLoadingWindow
-} = require('../change-loading-win-visibility-state')
+} = require('../window-creators/change-loading-win-visibility-state')
 const {
   closeAlert
 } = require('../modal-dialog-src/utils')
 const parseEnvValToBool = require('../helpers/parse-env-val-to-bool')
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('../window-event-manager')
+} = require('../window-creators/window-event-manager')
 
 const MENU_ITEM_IDS = require('../create-menu/menu.item.ids')
 

src/change-sync-frequency.js

@@ -29,7 +29,7 @@ const getAlertCustomClassObj = require(
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('./window-event-manager')
+} = require('./window-creators/window-event-manager')
 
 const _getSchedulerRule = (timeFormat, alertRes) => {
   if (timeFormat.value === 'days') {