Merge pull request #507 from bitfinexcom/staging

ezewer · web-flow · commit d10f2bda5d77 · 2025-02-22T00:37:41.000+11:00
Release version 4.33.0
diff --git a/.eslintrc b/.eslintrc
@@ -2,5 +2,11 @@
   "env": {
     "mocha": true
   },
-  "extends": "standard"
+  "extends": "standard",
+  "ignorePatterns": [
+    ".github",
+    "bfx-report-ui",
+    "bfx-reports-framework",
+    "dist"
+  ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.33.0] - 2025-02-19
+
+### Added
+
+- Implemented `Electron` app menu bar and corresponding functionality in the UI title instead of the native one. 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 the practice has shown, because of the last one, many inexperienced users do not even know about the existence of menu functions). Available for the `Windows` and `Linux` app users. On the `Mac` we have to hide the menu in the UI and show the native electron menu bar due to some `MacOS` specifics, it's impossible to have proper menu item control from the UI. PR: [bfx-report-ui#898](https://github.com/bitfinexcom/bfx-report-ui/pull/898)
+- Added exponential backoff and jitter for bfx-api requests to improve `Rate Limit` bypassing. Here we implemented `Decorrelated Jitter` described in AWS article https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/ And added a small improvement to shift the starting point of jitter for each iteration. In practice, it helps better to move through the `Rate Limit` for the `Sync` and `Tax Report`. PR: [bfx-report#420](https://github.com/bitfinexcom/bfx-report/pull/420)
+
+### Changed
+
+- Changed font family to `Inter` similar to used on the main platform. PR: [bfx-report-ui#896](https://github.com/bitfinexcom/bfx-report-ui/pull/896)
+- Reworked and optimized `ThemeSwitcher` component in a more performant way and reduced redundant code. PR: [bfx-report-ui#897](https://github.com/bitfinexcom/bfx-report-ui/pull/897)
+- Changed the font family from `Roboto` to `Inter` in the Electron env to prevent throwing error due to the last UI changes (electron layouts use font source from the UI sub-module). PR: [bfx-report-electron#494](https://github.com/bitfinexcom/bfx-report-electron/pull/494)
+- Disabled native title menu bar to use UI implementation via Electron renderer IPC bridge. PR: [bfx-report-electron#504](https://github.com/bitfinexcom/bfx-report-electron/pull/504)
+- Migrated from `html-pdf` to `puppeteer` for `pdf` creation as the first one repo is not `maintained` anymore. PRs: [bfx-reports-framework#432](https://github.com/bitfinexcom/bfx-reports-framework/pull/432), [bfx-report#419](https://github.com/bitfinexcom/bfx-report/pull/419)
+
+### Fixed
+
+- Fixed setting `IS_AUTO_UPDATE_DISABLED` config flag for the `dev` mode. PR: [bfx-report-electron#484](https://github.com/bitfinexcom/bfx-report-electron/pull/484)
+- Fixed the UI setup flow for the `dev` mode. PR: [bfx-report-electron#485](https://github.com/bitfinexcom/bfx-report-electron/pull/485)
+- Fixed error metadata processing, related to this test pipeline: https://github.com/bitfinexcom/bfx-report/actions/runs/12114987593/job/33772854879 PR: [bfx-report#418](https://github.com/bitfinexcom/bfx-report/pull/418)
+
 ## [4.32.0] - 2025-01-22
 
 ### Added
diff --git a/bfx-report-ui b/bfx-report-ui
@@ -1 +1 @@
-Subproject commit f7ce617d3f8af6cbd2f8f0f8397b68d4605bc350
+Subproject commit 60b6e9ed5a6e7340d07139fe212fcbc435b6e7b7
diff --git a/bfx-reports-framework b/bfx-reports-framework
@@ -1 +1 @@
-Subproject commit 56cbe765e373d4402c1020e9c0d435245d5c8cfa
+Subproject commit 1ea2430f94a00b3c057f3c960c5f8a7c51a9d819
diff --git a/electronEnv.json.example b/electronEnv.json.example
@@ -1,6 +1,5 @@
 {
   "NODE_ENV": "production",
   "IS_AUTO_UPDATE_DISABLED": false,
-  "REPO_OWNER": "bitfinexcom",
-  "SHOW_NATIVE_TITLE_BAR": true
+  "REPO_OWNER": "bitfinexcom"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.32.0",
+  "version": "4.33.0",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",
diff --git a/scripts/build-release.sh b/scripts/build-release.sh
@@ -153,11 +153,11 @@ if [ $isAutoUpdateDisabled == 1 ]; then
   echo -e "\n${COLOR_YELLOW}Auto-update is turned off!${COLOR_NORMAL}"
 
   sed -i".bak" -E -e \
-    "s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
+    "s/\"IS_AUTO_UPDATE_DISABLED\": ((false)|(true))/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
     "$ROOT/$ELECTRON_ENV_FILE_NAME"; rm -f "$ROOT/$ELECTRON_ENV_FILE_NAME.bak"
 else
   sed -i".bak" -E -e \
-    "s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
+    "s/\"IS_AUTO_UPDATE_DISABLED\": ((false)|(true))/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
     "$ROOT/$ELECTRON_ENV_FILE_NAME"; rm -f "$ROOT/$ELECTRON_ENV_FILE_NAME.bak"
 fi
 
diff --git a/scripts/build-ui.sh b/scripts/build-ui.sh
@@ -128,9 +128,12 @@ checkNodeModulesDir "$UI_FOLDER"
 npm ls --depth=0 --only=prod 1<&-
 
 echo -e "\n${COLOR_BLUE}UI building...${COLOR_NORMAL}"
-mv -f "$ROOT/.eslintrc" "$ROOT/off-eslintrc"
-npm run build
-mv -f "$ROOT/off-eslintrc" "$ROOT/.eslintrc"
+mv -f "$ROOT/.eslintrc" "$ROOT/off-eslintrc" || [[ $? == 1 ]]
+npm run build || (
+    echo -e "\n${COLOR_RED}The UI has not been built successful${COLOR_NORMAL}" >&2 &&
+    exit 1
+  )
+mv -f "$ROOT/off-eslintrc" "$ROOT/.eslintrc" || [[ $? == 1 ]]
 
 if ! [ -s "$UI_BUILD_FOLDER/index.html" ]; then
   echo -e "\n${COLOR_RED}The UI has not been built successful${COLOR_NORMAL}" >&2
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -95,11 +95,11 @@ if [ $isAutoUpdateDisabled == 1 ]; then
   echo -e "\n${COLOR_YELLOW}Auto-update is turned off!${COLOR_NORMAL}"
 
   sed -i".bak" -E -e \
-    "s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
+    "s/\"IS_AUTO_UPDATE_DISABLED\": ((false)|(true))/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
     "$ROOT/$ELECTRON_ENV_FILE_NAME"; rm -f "$ROOT/$ELECTRON_ENV_FILE_NAME.bak"
 else
   sed -i".bak" -E -e \
-    "s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
+    "s/\"IS_AUTO_UPDATE_DISABLED\": ((false)|(true))/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
     "$ROOT/$ELECTRON_ENV_FILE_NAME"; rm -f "$ROOT/$ELECTRON_ENV_FILE_NAME.bak"
 fi
 
diff --git a/src/auto-updater/toast-src/toast.css b/src/auto-updater/toast-src/toast.css
@@ -1,5 +1,6 @@
 body .swal2-container {
-  font-family: "Roboto", sans-serif;
+  font-family: "Inter", sans-serif;
+  font-feature-settings: 'tnum';
   margin: 0;
 }
 
diff --git a/src/helpers/get-ui-fonts-as-css-string.js b/src/helpers/get-ui-fonts-as-css-string.js
@@ -6,12 +6,12 @@ const path = require('path')
 
 const fontsPath = path.join(rootPath, 'bfx-report-ui/build/fonts/')
 const fontsStyle = fs.readFileSync(
-  path.join(fontsPath, 'roboto.css'),
+  path.join(fontsPath, 'inter.css'),
   'utf8'
 )
 const fStyleWithNormalizedPaths = fontsStyle.replace(
-  /url\(\.\/(.*\..*)\)/g,
-  `url(${fontsPath}$1)`
+  /url\('\.\/(.*\..*)'\)/g,
+  `url('${fontsPath}$1')`
 )
 
 module.exports = () => fStyleWithNormalizedPaths
diff --git a/src/modal-dialog-src/modal-dialog.css b/src/modal-dialog-src/modal-dialog.css
@@ -1,5 +1,6 @@
 body .swal2-container {
-  font-family: "Roboto", sans-serif;
+  font-family: "Inter", sans-serif;
+  font-feature-settings: 'tnum';
 }
 
 body::-webkit-scrollbar,
diff --git a/src/window-creators/layouts/app-init-error.html b/src/window-creators/layouts/app-init-error.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="shortcut icon" href="../../../bfx-report-ui/build/favicon.ico">
-    <link href="../../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
+    <link href="../../../bfx-report-ui/build/fonts/inter.css" rel="stylesheet">
     <title>Bitfinex Reports</title>
     <style>
       html {
@@ -20,7 +20,8 @@
         justify-content: center;
         text-align: center;
         background-color: #172d3e;
-        font-family: "Roboto", sans-serif;
+        font-family: "Inter", sans-serif;
+        font-feature-settings: 'tnum';
       }
 
       .alert {
diff --git a/src/window-creators/layouts/app-init.html b/src/window-creators/layouts/app-init.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="shortcut icon" href="../../../bfx-report-ui/build/favicon.ico">
-  <link href="../../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
+  <link href="../../../bfx-report-ui/build/fonts/inter.css" rel="stylesheet">
   <title>Bitfinex Reports</title>
   <style>
     html {
@@ -19,7 +19,8 @@
       margin: 0;
       text-align: center;
       background-color: #172d3e;
-        font-family: "Roboto", sans-serif;
+      font-family: "Inter", sans-serif;
+      font-feature-settings: 'tnum';
     }
 
     .win-control-btn {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"NODE_ENV": "production",`
`3`	`3`	`"IS_AUTO_UPDATE_DISABLED": false,`
`4`		`- "REPO_OWNER": "bitfinexcom",`
`5`		`- "SHOW_NATIVE_TITLE_BAR": true`
	`4`	`+ "REPO_OWNER": "bitfinexcom"`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bfx-report-electron",`
`3`		`- "version": "4.32.0",`
	`3`	`+ "version": "4.33.0",`
`4`	`4`	`"repository": "https://github.com/bitfinexcom/bfx-report-electron",`
`5`	`5`	`"description": "Reporting tool",`
`6`	`6`	`"author": "bitfinex.com",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`body .swal2-container {`
`2`		`- font-family: "Roboto", sans-serif;`
	`2`	`+ font-family: "Inter", sans-serif;`
	`3`	`+ font-feature-settings: 'tnum';`
`3`	`4`	`margin: 0;`
`4`	`5`	`}`
`5`	`6`