Skip to content

Commit

Permalink
Merge pull request #839 from bitfinexcom/staging
Browse files Browse the repository at this point in the history
Release version to master
  • Loading branch information
prdn authored Jul 31, 2024
2 parents 3001f10 + 3dabc23 commit ef3faa5
Show file tree
Hide file tree
Showing 32 changed files with 555 additions and 1,016 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bfx-report-ui",
"version": "2.42.1",
"version": "2.43.0",
"description": "Report page to overview the user actions in Bitfinex and download related csv files",
"repository": {
"type": "git",
Expand Down
34 changes: 28 additions & 6 deletions public/locales/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@
},
"selector": {
"select": "Select",
"strategy": "Strategy",
"all": "All",
"inactive": "Inactive",
"balance-precision": {
Expand Down Expand Up @@ -727,16 +728,37 @@
},
"taxreport": {
"title": "Tax Report",
"sections": {
"startSnapshot": "Start Snapshot",
"endSnapshot": "End Snapshot",
"finalResult": "Final Result"
},
"startingPeriodBalances": "Starting Period Balances",
"endingPeriodBalances": "Ending Period Balances",
"startPositions": "Starting Positions Snapshot",
"endPositions": "Ending Positions Snapshot",
"movements": "Movements"
"movements": "Movements",
"cols": {
"currency": "Currency",
"source": "Source",
"amount": "Amount",
"dateAcquired": "Date Acquired ",
"dateSold": "Date Sold",
"proceeds": "Proceeds",
"cost": "Cost",
"gainOrLoss": "Gain or Loss"
},
"sources":{
"airdrop_on_wallet": "Airdrop on wallet",
"margin_funding_payment": "Margin funding payment",
"affiliate_rebate": "Affiliate rebate",
"staking_payment": "Staking payment",
"exchange": "Exchange"
},
"disclaimer": {
"title": "Disclaimer",
"message": "The tax reports generated by this app are for informational purposes only. We do not guarantee accuracy or completeness. Always consult a qualified tax advisor to ensure compliance with current tax laws and personalized advice. Your reliance on the generated reports is at your own risk."
},
"generation": {
"success": "Tax Report generated",
"title": "Your tax report is being generated. This process can take a while.",
"note": "If you have a large history it's recommended to keep the window open in the background until it's completed."
}
},
"theme": {
"light": "Light",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Auth/LoginOtp/LoginOtp.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useSelector } from 'react-redux'
import PropTypes from 'prop-types'
import { useTranslation } from 'react-i18next'
import { Button, Intent } from '@blueprintjs/core'
import { isEmpty } from '@bitfinex/lib-js-util-base'
import { isEmpty, isEqual } from '@bitfinex/lib-js-util-base'

import useKeyDown from 'hooks/useKeyDown'
import { getIsAuthBtnDisabled } from 'state/auth/selectors'
Expand All @@ -26,7 +26,7 @@ export const LoginOtp = ({
}, ['Enter'])

useEffect(() => {
if (otp?.length === 6) {
if (isEqual(otp?.length, 6) && !isAuthBtnDisabled) {
handleOneTimePassword()
}
}, [otp])
Expand Down Expand Up @@ -55,7 +55,7 @@ export const LoginOtp = ({
intent={Intent.SUCCESS}
className='bitfinex-auth-check'
onClick={handleOneTimePassword}
disabled={isEmpty(otp || isAuthBtnDisabled)}
disabled={isEmpty(otp) || isAuthBtnDisabled}
>
{t('auth.2FA.auth')}
</Button>
Expand Down
73 changes: 0 additions & 73 deletions src/components/TaxReport/Result/Balances.columns.js

This file was deleted.

35 changes: 0 additions & 35 deletions src/components/TaxReport/Result/Result.container.js

This file was deleted.

Loading

0 comments on commit ef3faa5

Please sign in to comment.