Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Update dependencies 15-09-2020 #458

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 41 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"keywords": ["thorchain", "asgardex", "bepswap", "thornode", "bitcoin", "ethereum", "binance chain"],
"homepage": "https://thorchain.org",
"dependencies": {
"@ant-design/icons": "^4.2.1",
"@ant-design/icons": "^4.2.2",
"@binance-chain/javascript-sdk": "^4.1.1",
"@craco/craco": "^5.6.4",
"@devexperts/remote-data-ts": "^2.0.3",
"@devexperts/remote-data-ts": "^2.0.4",
"@devexperts/rx-utils": "^1.0.0-alpha.14",
"@devexperts/utils": "^1.0.0-alpha.14",
"@openapitools/openapi-generator-cli": "^1.0.15-4.3.1",
"@openapitools/openapi-generator-cli": "^1.0.18-4.3.1",
"@thorchain/asgardex-binance": "^3.0.1",
"@thorchain/asgardex-bitcoin": "https://gitlab.com/thorchain/asgardex-common/asgardex-bitcoin.git#1356f4512d8e1be28103c294bfca6d62730b008c",
"@thorchain/asgardex-crypto": "https://gitlab.com/thorchain/asgardex-common/asgardex-crypto.git",
Expand All @@ -63,81 +63,81 @@
"@thorchain/asgardex-theme": "^0.1.1",
"@thorchain/asgardex-util": "^0.4.0",
"@types/electron-devtools-installer": "^2.2.0",
"antd": "^4.6.1",
"antd": "^4.6.4",
"bignumber.js": "^9.0.0",
"electron-debug": "^3.1.0",
"electron-log": "^4.2.2",
"ethers": "^5.0.9",
"fp-ts": "^2.8.1",
"electron-log": "^4.2.4",
"ethers": "^5.0.13",
"fp-ts": "2.8.1",
"fp-ts-rxjs": "^0.6.9",
"fs-extra": "^9.0.1",
"lodash.shuffle": "^4.2.0",
"observable-hooks": "^3.0.0",
"observable-hooks": "^3.1.2",
"qrcode": "^1.4.4",
"react": "^16.13.1",
"react-circular-progressbar": "^2.0.3",
"react-dom": "^16.13.1",
"react-draggable": "^4.4.3",
"react-intl": "^5.4.5",
"react-intl": "^5.8.1",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-scripts": "3.4.3",
"react-test-renderer": "^16.13.1",
"rxjs": "^6.6.2",
"styled-components": "^5.1.1",
"rxjs": "^6.6.3",
"styled-components": "^5.2.0",
"styled-theme": "^0.3.3",
"typescript": "^3.9.7",
"typescript": "^4.0.2",
"uuid": "^8.3.0"
},
"devDependencies": {
"@hot-loader/react-dom": "^16.13.0",
"@react-theming/storybook-addon": "^1.0.3",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-knobs": "^5.3.19",
"@storybook/addon-links": "^5.3.19",
"@storybook/addon-viewport": "^5.3.19",
"@storybook/addons": "^5.3.19",
"@storybook/addon-actions": "^6.0.21",
"@storybook/addon-knobs": "^6.0.21",
"@storybook/addon-links": "^6.0.21",
"@storybook/addon-viewport": "^6.0.21",
"@storybook/addons": "^6.0.21",
"@storybook/preset-create-react-app": "^3.1.4",
"@storybook/react": "^5.3.19",
"@storybook/theming": "^5.3.19",
"@testing-library/jest-dom": "^5.11.2",
"@testing-library/react": "^10.4.7",
"@storybook/react": "^6.0.21",
"@storybook/theming": "^6.0.21",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.0.4",
"@testing-library/react-hooks": "^3.4.1",
"@testing-library/user-event": "^12.1.0",
"@testing-library/user-event": "^12.1.5",
"@types/fs-extra": "^9.0.1",
"@types/jest": "^26.0.8",
"@types/jest": "^26.0.13",
"@types/lodash.shuffle": "^4.2.6",
"@types/node": "^13",
"@types/node": "^14",
"@types/qrcode": "^1.3.5",
"@types/react": "^16.9.44",
"@types/react": "^16.9.49",
"@types/react-dom": "^16.9.8",
"@types/react-intl": "^3.0.0",
"@types/react-router-dom": "^5.1.5",
"@types/styled-components": "^5.1.2",
"@typescript-eslint/eslint-plugin": "^3.7.1",
"@typescript-eslint/parser": "^3.7.1",
"concurrently": "^5.2.0",
"@types/styled-components": "^5.1.3",
"@typescript-eslint/eslint-plugin": "^4.1.1",
"@typescript-eslint/parser": "^4.1.1",
"concurrently": "^5.3.0",
"cross-env": "^7.0.2",
"electron": "^9.1.2",
"electron": "^9.3.1",
"electron-builder": "^22.8.0",
"electron-devtools-installer": "^3.1.1",
"electron-notarize": "^1.0.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.5",
"eslint-plugin-react-hooks": "^4.0.8",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.1.2",
"git-revision-webpack-plugin": "^3.0.6",
"husky": "^4.2.5",
"lint-staged": "^10.2.11",
"husky": "^4.3.0",
"lint-staged": "^10.3.0",
"nodemon": "^2.0.4",
"prettier": "^2.0.5",
"testcafe": "^1.8.8",
"prettier": "^2.1.1",
"testcafe": "^1.9.2",
"testcafe-browser-provider-electron": "^0.0.15",
"testcafe-react-selectors": "^4.0.0",
"ts-jest": "^26.1.4",
"ts-loader": "^8.0.2",
"ts-node": "^8.10.2",
"wait-on": "^5.1.0",
"ts-jest": "^26.3.0",
"ts-loader": "^8.0.3",
"ts-node": "^9.0.0",
"wait-on": "^5.2.0",
"webpack-cli": "^3.3.12"
}
}
1 change: 1 addition & 0 deletions src/renderer/components/header/HeaderLock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const HeaderLock: React.FC<Props> = (props: Props): JSX.Element => {

const color = useMemo(() => palette('text', 0)({ theme }), [theme])

// eslint-disable-next-line react-hooks/exhaustive-deps
const iconStyle = { fontSize: '1.5em', cursor: disabled ? 'not-allowed' : 'pointer' }

const clickHandler = useCallback((_: React.MouseEvent) => onPress(), [onPress])
Expand Down
5 changes: 2 additions & 3 deletions src/renderer/components/shared/error/ErrorView.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ export const Result = styled(A.Result)`
`}
background-color: ${palette('background', 1)};

.ant-result-title{
.ant-result-title {
color: ${palette('text', 0)};
}
.ant-result-subtitle{
.ant-result-subtitle {
color: ${palette('text', 1)};
}

`
export const IconWrapper = styled.div`
display: inline-block;
Expand Down
5 changes: 2 additions & 3 deletions src/renderer/components/shared/success/SuccessView.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ export const Result = styled(A.Result)`
`}
background-color: ${palette('background', 1)};

.ant-result-title{
.ant-result-title {
color: ${palette('text', 0)};
}
.ant-result-subtitle{
.ant-result-subtitle {
color: ${palette('text', 1)};
}

`
export const IconWrapper = styled.div`
display: inline-block;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { pipe } from 'fp-ts/pipeable'
import { sequenceTOption } from '../../../helpers/fpHelpers'
import * as Styled from './CurrencyInfo.styles'

type CurrencyInfo = {
type Props = {
from?: O.Option<{ asset: Asset; priceRune: BigNumber }>
to?: O.Option<{ asset: Asset; priceRune: BigNumber }>
slip?: BigNumber
}

export const CurrencyInfo = ({ to = O.none, from = O.none, slip = bn(0) }: CurrencyInfo) => {
export const CurrencyInfo = ({ to = O.none, from = O.none, slip = bn(0) }: Props) => {
return pipe(
sequenceTOption(from, to),
O.map(([from, to]) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ const AssetInput: React.FC<Props> = (props: Props): JSX.Element => {
)

const handleClickWrapper = useCallback(() => {
inputRef.current?.firstChild?.focus()
const target = inputRef.current?.firstChild
if (target) target.focus()
}, [])

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { palette } from 'styled-theme'

type PoolShareAccent = 'primary' | 'secondary'
type DetailsWrapperProps = { accent: PoolShareAccent }
type BorderWrapperProps = { showTopBorder?: boolean }

export const PoolShareWrapper = styled.div`
padding: 0px 12px 12px 16px;
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/wallet/AssetsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const AssetsTable: React.FC<Props> = (props: Props): JSX.Element => {
[intl, renderPriceColumn, poolDetails, pricePool.poolData]
)

// eslint-disable-next-line react-hooks/exhaustive-deps
const columns = [iconColumn, nameColumn, tickerColumn, balanceColumn, priceColumn]

const onRow = useCallback(
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/components/wallet/TransactionsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,10 @@ const TransactionsTable: React.FC<Props> = (props: Props): JSX.Element => {
render: renderLinkColumn
}

// eslint-disable-next-line react-hooks/exhaustive-deps
const desktopColumns: ColumnsType<Tx> = [typeColumn, fromColumn, toColumn, dateColumn, amountColumn, linkColumn]

// eslint-disable-next-line react-hooks/exhaustive-deps
const mobileColumns: ColumnsType<Tx> = [typeColumn, amountColumn, dateColumn, linkColumn]

const renderTable = useCallback(
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/wallet/txs/Receive.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Receive: React.FC<Props> = (props: Props): JSX.Element => {
setErrorMsg(intl.formatMessage({ id: 'wallet.receive.address.errorQR' }, { error: err.toString() }))
} else {
setHasQR(true)
canvasContainer.current?.appendChild(canvas)
if (canvasContainer.current) canvasContainer.current.appendChild(canvas)
}
})
}
Expand Down
1 change: 1 addition & 0 deletions src/renderer/helpers/rx/liveData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Observable } from 'rxjs'
export type LiveData<E, A> = Observable<RemoteData<E, A>>

export const URI = '//LiveData'
// eslint-disable-next-line no-redeclare
export type URI = typeof URI
declare module 'fp-ts/lib/HKT' {
interface URItoKind2<E, A> {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/hooks/useOutsideClick.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function useClickOutside<T extends Element>(
useEffect(() => {
const clickHandler = (e: MouseEvent) => {
if (!ref?.current?.contains(e.target as Element) && callbackRef.current) {
callbackRef?.current(e)
callbackRef.current(e)
}
}
window.addEventListener('click', clickHandler, options)
Expand Down
4 changes: 4 additions & 0 deletions src/renderer/views/pools/PoolsOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ const PoolsOverview: React.FC<Props> = (_): JSX.Element => {
sortDirections: ['descend', 'ascend']
}

// eslint-disable-next-line react-hooks/exhaustive-deps
const desktopPoolsColumns: ColumnsType<PoolTableRowData> = [
poolColumn,
assetColumn,
Expand All @@ -323,6 +324,7 @@ const PoolsOverview: React.FC<Props> = (_): JSX.Element => {
btnPoolsColumn
]

// eslint-disable-next-line react-hooks/exhaustive-deps
const mobilePoolsColumns: ColumnsType<PoolTableRowData> = [poolColumnMobile, btnPoolsColumn]

const renderPoolsTable = useCallback(
Expand Down Expand Up @@ -410,6 +412,7 @@ const PoolsOverview: React.FC<Props> = (_): JSX.Element => {
render: renderBlockLeftColumn
}

// eslint-disable-next-line react-hooks/exhaustive-deps
const desktopPendingPoolsColumns: ColumnsType<PoolTableRowData> = [
poolColumn,
assetColumn,
Expand All @@ -419,6 +422,7 @@ const PoolsOverview: React.FC<Props> = (_): JSX.Element => {
btnPendingPoolsColumn
]

// eslint-disable-next-line react-hooks/exhaustive-deps
const mobilePendingPoolsColumns: ColumnsType<PoolTableRowData> = [poolColumnMobile, btnPendingPoolsColumn]

const renderPendingPoolsTable = useCallback(
Expand Down
Loading