bitfinexcom · ezewer · Nov 13, 2024 · Oct 14, 2024 · Oct 14, 2024 · Oct 15, 2024
diff --git a/.env.example b/.env.example
@@ -4,6 +4,7 @@ REPO_BRANCH=master
 IS_BFX_API_STAGING=0
 IS_DEV_ENV=0
 IS_AUTO_UPDATE_DISABLED=0
+IS_AUTO_UPDATE_BEING_TESTED=0
 
 SHOULD_LOCALHOST_BE_USED_FOR_LOADING_UI_IN_DEV_MODE=0
 

diff --git a/.github/workflows/build-electron-app.yml b/.github/workflows/build-electron-app.yml
@@ -134,16 +134,12 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: recursive
-    - name: Replace macOS’s sed with GNU’s sed
-      run: |
-        brew install gnu-sed
-        echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - if: github.event.inputs.version != ''
       name: Set release version
       run: |
-        sed -i -e \
+        sed -i".bak" -E -e \
           "s/\"version\": \".*\"/\"version\": \"${{ github.event.inputs.version }}\"/g" \
-          "./package.json"
+          "./package.json"; rm -f "./package.json.bak"
     - if: contains(fromJson('["true", "1", true, 1]'), github.event.inputs.isAutoUpdateDisabled)
       name: Turn off auto-update
       run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.30.0] - 2024-11-13
+
+### Added
+
+- Implemented `Your Assets` section for the web `Account Summary` page. Improved sections titles styling. PR: [bfx-report-ui#880](https://github.com/bitfinexcom/bfx-report-ui/pull/880)
+- Implemented `UI` language selection binding with `ElectronJS` wrapper. PR: [bfx-report-ui#882](https://github.com/bitfinexcom/bfx-report-ui/pull/882)
+- Extended ElectronJS app wrapper translations. Improved the app-init-error layout. Fixed logs collection for bug report. PR: [bfx-report-electron#422](https://github.com/bitfinexcom/bfx-report-electron/pull/422)
+- Added translation support to the `error manager` module. PR: [bfx-report-electron#428](https://github.com/bitfinexcom/bfx-report-electron/pull/428)
+- Added translation support to the `native notifications` module. PR: [bfx-report-electron#429](https://github.com/bitfinexcom/bfx-report-electron/pull/429)
+- Added translation support to the `auto-updater` module. PRs: [bfx-report-electron#430](https://github.com/bitfinexcom/bfx-report-electron/pull/430), [bfx-report-electron#438](https://github.com/bitfinexcom/bfx-report-electron/pull/438)
+- Added translation support to the `restore DB` module. PR: [bfx-report-electron#431](https://github.com/bitfinexcom/bfx-report-electron/pull/431)
+- Added translation support to the `show-docs` module, and added the ability to set the `markdown` user manual with different languages into `i18next` (if doc for the corresponding lang does not exist takes `en` by default). PR: [bfx-report-electron#434](https://github.com/bitfinexcom/bfx-report-electron/pull/434)
+- Added translation support to the `print-to-pdf` module. PR: [bfx-report-electron#435](https://github.com/bitfinexcom/bfx-report-electron/pull/435)
+- Added translation support to the `change-reports-folder` module. PR: [bfx-report-electron#436](https://github.com/bitfinexcom/bfx-report-electron/pull/436)
+- Added translation support to the `change-sync-frequency` module. PR: [bfx-report-electron#437](https://github.com/bitfinexcom/bfx-report-electron/pull/437)
+- Added translation support to the `enforce-macos-app-location` module. PR: [bfx-report-electron#439](https://github.com/bitfinexcom/bfx-report-electron/pull/439)
+
+### Changed
+
+- Improved the loading window workflow to bring more consistency in the sequence of showing windows. Added ability to send/listen events for the app-init layout via the context bridge between the main and renderer ipc to be secure. Fixed issue with focusing the main window on the launch. PR: [bfx-report-electron#424](https://github.com/bitfinexcom/bfx-report-electron/pull/424)
+- Prevented returning the translation key `key.nestedKey.etc` if a value is missing for a certain language and added the ability to try to take one from the default `en` translation file. PR: [bfx-report-electron#426](https://github.com/bitfinexcom/bfx-report-electron/pull/426)
+- Reworked `sed` commands to be able to run the build `bash` scripts on both OSs `Ubuntu` and `MacOS` as they have slightly different implementation. PR: [bfx-report-electron#427](https://github.com/bitfinexcom/bfx-report-electron/pull/427)
+
+### Fixed
+
+- Fixed `2FA` login flow to prevent the token request duplication possibility noted in some user scenarios. PR: [bfx-report-ui#881](https://github.com/bitfinexcom/bfx-report-ui/pull/881)
+- Fixed issue with `Wine` to build `Windows` release under container. PR: [bfx-report-electron#425](https://github.com/bitfinexcom/bfx-report-electron/pull/425)
+- Fixed loading UI fonts to all modal windows. PR: [bfx-report-electron#432](https://github.com/bitfinexcom/bfx-report-electron/pull/432)
+
+### Security
+
+- Bumped `cookie` from `0.6.0` to `0.7.1`, `express` from `4.21.0` to `4.21.1`. PR: [bfx-report-ui#879](https://github.com/bitfinexcom/bfx-report-ui/pull/879)
+- Bumped `electron` from `27.3.11` to `27.3.5`. PR: [bfx-report-electron#424](https://github.com/bitfinexcom/bfx-report-electron/pull/424)
+
 ## [4.29.0] - 2024-10-16
 
 ### Added

diff --git a/Dockerfile.win-builder b/Dockerfile.win-builder
@@ -10,7 +10,7 @@ COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh
 RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
   # Remove the `Wine` source entry to resolve
   # the release key expiration issue for `apt-get update`
-  && sed -i '/Wine/d' /etc/apt/sources.list \
+  && rm -rf /etc/apt/sources.list.d/wine* \
   && apt-get update -y \
   && apt-get install -y --no-install-recommends \
     p7zip-full \

diff --git a/bfx-report-ui b/bfx-report-ui
diff --git a/bfx-reports-framework b/bfx-reports-framework
diff --git a/build/locales/en/translations.json b/build/locales/en/translations.json
@@ -1,6 +1,132 @@
 {
   "common": {
-    "title": "Report"
+    "title": "Report",
+    "appInitError": {
+      "description": "Application initialization error",
+      "closeBtnText": "Close"
+    },
+    "errorManager": {
+      "failedToGetDocsPath": {
+        "title": "The OS Documents directory has been misconfigured",
+        "message": "This indicates that your OS `Documents` directory has been misconfigured.\n\rPlease, set it to a valid location or reset it to the default"
+      },
+      "errorModalDialog": {
+        "errBoxTitle": "Bug report",
+        "errBoxDescription": "A new GitHub issue will be opened",
+        "zenityBtn": "Report and Exit",
+        "confirmButtonText": "Report",
+        "cancelButtonText": "Cancel",
+        "title": "Should a bug report be submitted?"
+      }
+    },
+    "nativeNotification": {
+      "defaulTitle": "Bitfinex Report",
+      "defaultBody": "Notification",
+      "sync": {
+        "completedBody": "Data sync completed successfully!",
+        "interruptedBody": "Data sync interrupted!",
+        "errorBody": "Data sync completed with an error!"
+      },
+      "trxTaxReport": {
+        "completedBody": "Your tax report is ready!",
+        "errorBody": "An unexpected error occurred while generating the tax report!"
+      }
+    },
+    "autoUpdater": {
+      "title": "Update",
+      "confirmButtonText": "OK",
+      "cancelButtonText": "Cancel",
+      "loadingWindow": {
+        "description": "Updating..."
+      },
+      "errorToast": {
+        "title": "Application update failed",
+        "inetIssueTitle": "Internet disconnected"
+      },
+      "checkingForUpdateToast": {
+        "title": "Checking for update"
+      },
+      "updateAvailableToast": {
+        "title": "An update to v{{version}} is available",
+        "description": "Starting download..."
+      },
+      "updateNotAvailableToast": {
+        "title": "No updates available"
+      },
+      "downloadProgressToast": {
+        "title": "Downloading..."
+      },
+      "updateDownloadedToast": {
+        "title": "Update v{{version}} downloaded",
+        "description": "Should the app be updated right now?"
+      }
+    },
+    "restoreDB": {
+      "modalDialog": {
+        "title": "Select DB backup file",
+        "confirmButtonText": "OK",
+        "cancelButtonText": "Cancel"
+      },
+      "messageModalDialog": {
+        "title": "DB restoring",
+        "message": "Suitable DB backup file has not been found",
+        "dbRestoredMessage": "DB has been restored",
+        "dbNotRestoredMessage": "DB has not been restored",
+        "confirmButtonText": "OK"
+      }
+    },
+    "showDocs": {
+      "modalDialog": {
+        "title": "User manual",
+        "cancelButtonText": "Close"
+      }
+    },
+    "printToPDF": {
+      "defaultTemplate": "No data",
+      "pagination": {
+        "page": "Page",
+        "from": "from"
+      }
+    },
+    "changeReportsFolder": {
+      "modalDialog": {
+        "title": "Change reports folder",
+        "buttonLabel": "Select"
+      }
+    },
+    "changeSyncFrequency": {
+      "title": "Change sync frequency",
+      "timeFormatModalDialog": {
+        "title": "Set time format",
+        "confirmButtonText": "OK",
+        "cancelButtonText": "Cancel",
+        "inputOptions": {
+          "mins": "Mins",
+          "hours": "Hours",
+          "days": "Days"
+        }
+      },
+      "timeModalDialog": {
+        "title": "Set sync frequency",
+        "confirmButtonText": "OK",
+        "cancelButtonText": "Cancel"
+      }
+    },
+    "enforceMacOSAppLocation": {
+      "appLocationModalDialog": {
+        "message": "Move to Applications folder?",
+        "detail": "{{productName}} must live in the Applications folder to be able to run correctly",
+        "confirmButtonText": "Move to Applications folder",
+        "cancelButtonText": "Quit {{productName}}"
+      },
+      "loadingWindow": {
+        "description": "Moving the app..."
+      },
+      "appRunningModalDialog": {
+        "message": "Another version of {{productName}} is currently running. Quit it, then launch this version of the app again",
+        "confirmButtonText": "OK"
+      }
+    }
   },
   "menu": {
     "macMainSubmenu": {

diff --git a/build/locales/ru/translations.json b/build/locales/ru/translations.json
@@ -1,6 +1,132 @@
 {
   "common": {
-    "title": "Отчет"
+    "title": "Отчет",
+    "appInitError": {
+      "description": "Ошибка инициализации приложения",
+      "closeBtnText": "Закрыть"
+    },
+    "errorManager": {
+      "failedToGetDocsPath": {
+        "title": "Каталог Документы ОС был неправильно настроен",
+        "message": "Это означает, что каталог `Документы` вашей ОС был неправильно настроен.\n\rПожалуйста, укажите правильное расположение или сбросьте его до значений по умолчанию"
+      },
+      "errorModalDialog": {
+        "errBoxTitle": "Отчет об ошибке",
+        "errBoxDescription": "Будет открыта новая проблема в GitHub",
+        "zenityBtn": "Отправить Отчет и Выйти",
+        "confirmButtonText": "Отправить Отчет",
+        "cancelButtonText": "Отменить",
+        "title": "Должен ли быть отправлен отчет об ошибке?"
+      }
+    },
+    "nativeNotification": {
+      "defaulTitle": "Bitfinex Report",
+      "defaultBody": "Уведомление",
+      "sync": {
+        "completedBody": "Синхронизация данных успешно завершена!",
+        "interruptedBody": "Синхронизация данных прервана!",
+        "errorBody": "Синхронизация данных завершена с ошибкой!"
+      },
+      "trxTaxReport": {
+        "completedBody": "Ваш налоговый отчет готов!",
+        "errorBody": "При формировании налогового отчета произошла непредвиденная ошибка!"
+      }
+    },
+    "autoUpdater": {
+      "title": "Обновление",
+      "confirmButtonText": "OK",
+      "cancelButtonText": "Отменить",
+      "loadingWindow": {
+        "description": "Обновление..."
+      },
+      "errorToast": {
+        "title": "Обновление приложения не удалось",
+        "inetIssueTitle": "Интернет отключен"
+      },
+      "checkingForUpdateToast": {
+        "title": "Проверка обновления"
+      },
+      "updateAvailableToast": {
+        "title": "Доступно обновление до версии v{{version}}",
+        "description": "Начинаем загрузку..."
+      },
+      "updateNotAvailableToast": {
+        "title": "Нет доступных обновлений"
+      },
+      "downloadProgressToast": {
+        "title": "Загрузка..."
+      },
+      "updateDownloadedToast": {
+        "title": "Обновление v{{version}} загружено",
+        "description": "Стоит ли обновить приложение прямо сейчас?"
+      }
+    },
+    "restoreDB": {
+      "modalDialog": {
+        "title": "Выберите файл резервной копии БД",
+        "confirmButtonText": "OK",
+        "cancelButtonText": "Отменить"
+      },
+      "messageModalDialog": {
+        "title": "Восстановление БД",
+        "message": "Подходящий файл резервной копии БД не найден",
+        "dbRestoredMessage": "БД была восстановлена",
+        "dbNotRestoredMessage": "БД не была восстановлена",
+        "confirmButtonText": "OK"
+      }
+    },
+    "showDocs": {
+      "modalDialog": {
+        "title": "Руководство пользователя",
+        "cancelButtonText": "Закрыть"
+      }
+    },
+    "printToPDF": {
+      "defaultTemplate": "Нет данных",
+      "pagination": {
+        "page": "Страница",
+        "from": "из"
+      }
+    },
+    "changeReportsFolder": {
+      "modalDialog": {
+        "title": "Изменить папку отчетов",
+        "buttonLabel": "Выбрать"
+      }
+    },
+    "changeSyncFrequency": {
+      "title": "Изменить частоту синхронизации",
+      "timeFormatModalDialog": {
+        "title": "Установить формат времени",
+        "confirmButtonText": "OK",
+        "cancelButtonText": "Отмена",
+        "inputOptions": {
+          "mins": "Мин.",
+          "hours": "Часы",
+          "days": "Дни"
+        }
+      },
+      "timeModalDialog": {
+        "title": "Установить частоту синхронизации",
+        "confirmButtonText": "OK",
+        "cancelButtonText": "Отмена"
+      }
+    },
+    "enforceMacOSAppLocation": {
+      "appLocationModalDialog": {
+        "message": "Переместить в папку Приложения?",
+        "detail": "{{productName}} должен находиться в папке Приложения для корректной работы",
+        "confirmButtonText": "Переместить в папку Приложения",
+        "cancelButtonText": "Выйти из {{productName}}"
+      },
+      "loadingWindow": {
+        "description": "Перемещение приложения..."
+      },
+      "appRunningModalDialog": {
+        "message": "В настоящее время запущена другая версия {{productName}}. Закройте ее, затем снова запустите эту версию приложения",
+        "confirmButtonText": "OK"
+      }
+    }
   },
   "menu": {
     "macMainSubmenu": {

diff --git a/docs/user-manual.md → docs/en/user-manual.md b/docs/user-manual.md → docs/en/user-manual.md
diff --git a/index.js b/index.js
@@ -11,6 +11,10 @@ try {
     process.env[key] = val
   }
 } catch (err) {}
+try {
+  // Uses only in dev mode as dotenv is added into dev deps
+  require('dotenv').config({ override: true })
+} catch (err) {}
 
 const { app } = require('electron')
 require('./src/i18next')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.29.0",
+  "version": "4.30.0",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",
@@ -45,7 +45,7 @@
     "concurrently": "9.0.1",
     "cross-env": "7.0.3",
     "dotenv": "16.3.1",
-    "electron": "27.3.5",
+    "electron": "27.3.11",
     "electron-builder": "24.10.0",
     "mocha": "10.2.0",
     "standard": "17.1.0",
+9 −9		package-lock.json
+1 −1		package.json
+93 −0		src/components/AccountSummary/AccountSummary.assets.js
+2 −0		src/components/AccountSummary/AccountSummary.js
+19 −4		src/components/AccountSummary/_AccountSummary.scss
+3 −0		src/state/auth/saga.js
+8 −0		src/state/base/actions.js
+1 −0		src/state/base/constants.js
+17 −1		src/state/base/saga.js
+3 −1		src/state/ui/saga.js
+4 −1		src/ui/LangMenu/LangMenu.js