Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e5052ce
Add profits sagas tests
alexstotsky Sep 21, 2026
a53542b
Add profits state tests
alexstotsky Sep 21, 2026
a55d525
Merge pull request #1131 from alexstotsky/add-profits-test-coverage
jeojoe Oct 12, 2026
463028e
Bump shell-quote from 1.10.0 to 1.12.0
dependabot[bot] Oct 9, 2026
9a8e376
Bump i18next-http-backend from 4.0.0 to 4.0.2
dependabot[bot] Oct 9, 2026
88f7611
Bump axios from 1.18.1 to 1.20.0
dependabot[bot] Oct 9, 2026
22c8fb1
Bump @hcaptcha/react-hcaptcha from 2.0.2 to 2.2.0
dependabot[bot] Oct 8, 2026
2e44d61
Bump concurrently from 5.3.0 to 10.0.5
dependabot[bot] Oct 8, 2026
25ce403
Bump sass from 1.50.0 to 1.105.1
dependabot[bot] Oct 8, 2026
5ad13c4
Actualize engines and fix critical vulnerability
alexstotsky Oct 9, 2026
084aa01
Fix vulnerabilities
alexstotsky Oct 9, 2026
fcab879
Apply npm audit fix
alexstotsky Oct 13, 2026
4514ce5
Adjusted wallets data
alexstotsky Oct 14, 2026
36d038b
Provide exact balance handling into the query saga
alexstotsky Oct 14, 2026
8522fad
Rework wallets exact balance handling flow and refactor to functional
alexstotsky Oct 14, 2026
8b6a82a
Redundant conatiner cleanup
alexstotsky Oct 14, 2026
c8e5fe0
Actualize wallets sagas
alexstotsky Oct 14, 2026
ade6c60
Update wallets sagas tests
alexstotsky Oct 14, 2026
e678036
Actualize export
alexstotsky Oct 14, 2026
cd3177c
Cleanup
alexstotsky Oct 14, 2026
cd9ce27
Merge pull request #1132 from alexstotsky/upd-deps-fix-vulnerabilities
jeojoe Oct 20, 2026
b9ff703
Bump follow-redirects from 1.16.0 to 1.16.1
dependabot[bot] Oct 20, 2026
f40ac55
Add positions active sagas exports for testing
alexstotsky Oct 13, 2026
bbf3f98
Add positions active sagas tests
alexstotsky Oct 13, 2026
d243961
Update exports
alexstotsky Oct 13, 2026
c75a51d
Add positions active state tests
alexstotsky Oct 13, 2026
695bfb3
Merge pull request #1133 from alexstotsky/improve-wallets
jeojoe Oct 23, 2026
52591cd
Merge pull request #1135 from alexstotsky/add-pos-active-tests
jeojoe Oct 23, 2026
f7d3f92
Merge pull request #1134 from bitfinexcom/dependabot/npm_and_yarn/fol…
jeojoe Oct 23, 2026
7a860d4
Optimize copyFiles helper
alexstotsky Oct 22, 2026
e63d4f5
Remove vulnerable shelljs
alexstotsky Oct 26, 2026
6ede12b
Apply npm audit fix
alexstotsky Oct 26, 2026
39269e6
Improve sub-menu positioning
alexstotsky Oct 28, 2026
ffb0e12
Merge pull request #1141 from alexstotsky/rework-copy-file
jeojoe Oct 28, 2026
a27dd56
Merge pull request #1142 from alexstotsky/adjust-electron-sub-menu
jeojoe Oct 29, 2026
5cd6710
Bump version up to 2.65.1
ZIMkaRU Oct 30, 2026
45b3f50
Merge pull request #1144 from ZIMkaRU/feature/release-version
eugeneglova Oct 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,033 changes: 625 additions & 408 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 15 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bfx-report-ui",
"version": "2.65.0",
"version": "2.65.1",
"description": "Report page to overview the user actions in Bitfinex and download related csv files",
"repository": {
"type": "git",
Expand All @@ -23,24 +23,24 @@
"@blueprintjs/select": "3.19.1",
"@blueprintjs/table": "3.5.0",
"@blueprintjs/timezone": "3.10.1",
"@hcaptcha/react-hcaptcha": "2.0.2",
"axios": "1.18.1",
"@hcaptcha/react-hcaptcha": "2.2.0",
"axios": "1.20.0",
"bignumber.js": "9.3.1",
"classnames": "2.5.1",
"flexboxgrid2": "7.2.1",
"history": "4.10.1",
"i18next": "15.0.7",
"i18next-browser-languagedetector": "3.0.1",
"i18next-http-backend": "4.0.0",
"i18next-http-backend": "4.0.2",
"js-cookie": "3.0.8",
"lightweight-charts": "1.2.2",
"lodash": "4.18.1",
"memoize-one": "5.2.1",
"moment": "2.29.4",
"moment": "2.31.0",
"moment-timezone": "0.5.35",
"normalize.css": "8.0.1",
"prop-types": "15.8.1",
"query-string": "9.3.1",
"query-string": "9.5.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-google-recaptcha": "3.1.0",
Expand All @@ -55,14 +55,13 @@
"redux-logger": "3.0.6",
"redux-persist": "6.0.0",
"redux-saga": "1.4.2",
"sass": "1.50.0",
"shelljs": "0.10.0"
"sass": "1.105.1"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@redux-saga/testing-utils": "1.2.3",
"babel-eslint": "10.1.0",
"concurrently": "5.3.0",
"concurrently": "10.0.5",
"cross-env": "7.0.3",
"eslint": "7.32.0",
"eslint-config-airbnb": "17.1.0",
Expand All @@ -86,7 +85,7 @@
"lintFix": "eslint src scripts --fix --ignore-path .gitignore"
},
"engines": {
"node": ">=18.17.1",
"node": ">=20.19.0",
"npm": ">=9.6.7"
},
"jest": {
Expand All @@ -103,6 +102,11 @@
"overrides": {
"bfj": "9.1.3",
"serialize-javascript": "7.0.5",
"html-parse-stringify2": "2.0.2"
"html-parse-stringify2": "2.0.2",
"shell-quote": "1.12.0",
"@tootallnate/once": "2.0.1",
"sockjs": {
"uuid": "11.1.1"
}
}
}
7 changes: 2 additions & 5 deletions scripts/copyFiles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const shell = require('shelljs')
const fs = require('fs')

const filesMap = [
{
Expand All @@ -18,8 +18,5 @@ const filesMap = [
filesMap.forEach((pair) => {
// eslint-disable-next-line no-console
console.log(`Copying file from ${pair.source} to ${pair.destination}`)
const result = shell.cp(pair.source, pair.destination)
if (result.code === 1) {
throw result.stderr
}
fs.copyFileSync(pair.source, pair.destination)
})
12 changes: 11 additions & 1 deletion src/components/ElectronMenu/ElectronMenu.submenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@ import _filter from 'lodash/filter'

import { executeMenuCommand } from 'state/electronMenu/actions'

// same as Blueprint's default submenu modifiers, but with -1px offset instead of -5px:
// electron menus have no padding to compensate, only the 1px border
const SUBMENU_POPOVER_PROPS = {
modifiers: {
offset: { offset: -1 },
flip: { boundariesElement: 'viewport', padding: 20 },
preventOverflow: { boundariesElement: 'viewport', padding: 20 },
},
}

const SubMenu = ({ label, items }) => {
const dispatch = useDispatch()
const visibleItems = _filter(items, 'visible')

return (
<div className='electron-menu-submenu'>
<MenuItem text={label}>
<MenuItem text={label} popoverProps={SUBMENU_POPOVER_PROPS}>
{_map(visibleItems, ({
id, label: itemLabel, accelerator, enabled,
}, index) => (
Expand Down
50 changes: 0 additions & 50 deletions src/components/Wallets/Wallets.container.js

This file was deleted.

17 changes: 11 additions & 6 deletions src/components/Wallets/Wallets.data.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React from 'react'
import React, { memo } from 'react'
import PropTypes from 'prop-types'
import { withTranslation } from 'react-i18next'
import { useTranslation } from 'react-i18next'
import { isEmpty, isEqual } from '@bitfinex/lib-js-util-base'

import DataTable from 'ui/DataTable'

import { getColumns } from './Wallets.columns'
import { WALLETS_ENTRIES_PROPS } from './Wallets.props'
import constants from './var'

const {
Expand All @@ -17,11 +16,18 @@ const {
WALLET_CREDITLINE,
} = constants

const WALLETS_ENTRIES_PROPS = PropTypes.shape({
balanceUsd: PropTypes.number,
type: PropTypes.string.isRequired,
balance: PropTypes.number.isRequired,
currency: PropTypes.string.isRequired,
})

const WalletsData = ({
t,
entries,
isLoading,
}) => {
const { t } = useTranslation()
const exchangeData = entries.filter(entry => isEqual(entry.type, WALLET_EXCHANGE))
const marginData = entries.filter(entry => isEqual(entry.type, WALLET_MARGIN))
const fundingData = entries.filter(entry => isEqual(entry.type, WALLET_FUNDING))
Expand Down Expand Up @@ -93,9 +99,8 @@ const WalletsData = ({
}

WalletsData.propTypes = {
t: PropTypes.func.isRequired,
isLoading: PropTypes.bool.isRequired,
entries: PropTypes.arrayOf(WALLETS_ENTRIES_PROPS).isRequired,
}

export default withTranslation('translations')(WalletsData)
export default memo(WalletsData)
Loading
Loading