Skip to content

Commit

Permalink
Merge pull request #955 from oasisprotocol/buberdds/deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
buberdds committed Aug 4, 2022
2 parents 3493224 + 36e088e commit 8cc6b02
Show file tree
Hide file tree
Showing 4 changed files with 331 additions and 410 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
"bip39": "3.0.4",
"body-scroll-lock": "4.0.0-beta.0",
"chalk": "5.0.1",
"copy-to-clipboard": "3.3.1",
"grommet": "2.25.0",
"copy-to-clipboard": "3.3.2",
"grommet": "2.25.1",
"grommet-icons": "4.7.0",
"i18next": "20.6.1",
"i18next-browser-languagedetector": "6.1.4",
"qrcode.react": "1.0.1",
"qrcode.react": "3.1.0",
"react": "17.0.2",
"react-app-polyfill": "3.0.0",
"react-data-table-component": "6.11.8",
Expand Down Expand Up @@ -103,7 +103,7 @@
"@testing-library/user-event": "13.5.0",
"@types/body-scroll-lock": "3.1.0",
"@types/jest": "27.4.1",
"@types/jest-when": "3.5.0",
"@types/jest-when": "3.5.2",
"@types/node": "16.11.43",
"@types/node-fetch": "3.0.3",
"@types/qrcode.react": "1.0.2",
Expand All @@ -116,17 +116,17 @@
"@types/rimraf": "3.0.2",
"@types/shelljs": "0.8.11",
"@types/styled-components": "5.1.25",
"@types/testing-library__jest-dom": "5.14.3",
"@types/testing-library__jest-dom": "5.14.5",
"@types/valid-url": "1.0.3",
"@types/w3c-web-usb": "1.0.6",
"@typescript-eslint/eslint-plugin": "5.30.5",
"@typescript-eslint/parser": "5.30.5",
"@typescript-eslint/eslint-plugin": "5.32.0",
"@typescript-eslint/parser": "5.32.0",
"babel-jest": "27.5.1",
"babel-plugin-istanbul": "6.1.1",
"babel-preset-react-app": "10.0.1",
"cross-env": "7.0.3",
"cypress": "9.3.1",
"eslint": "8.19.0",
"eslint": "8.21.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-react-app": "7.0.1",
"eslint-plugin-prettier": "3.4.1",
Expand All @@ -136,16 +136,16 @@
"i18next-scanner-typescript": "1.0.6",
"jest": "27.5.1",
"jest-styled-components": "7.0.5",
"jest-watch-typeahead": "1.0.0",
"jest-watch-typeahead": "2.0.0",
"jest-when": "3.5.1",
"node-plop": "0.26.3",
"nodemon": "2.0.18",
"nodemon": "2.0.19",
"parcel": "2.6.2",
"parcel-transformer-env-variables-injection": "0.1.2",
"plop": "2.7.6",
"portable-fetch": "3.0.0",
"prettier": "2.7.1",
"redux-saga-test-plan": "4.0.4",
"redux-saga-test-plan": "4.0.5",
"rimraf": "3.0.2",
"sanitize.css": "13.0.0",
"semantic-release": "18.0.1",
Expand All @@ -155,11 +155,11 @@
"stylelint-config-recommended": "6.0.0",
"stylelint-config-styled-components": "0.1.1",
"stylelint-processor-styled-components": "1.10.0",
"ts-node": "10.8.2",
"ts-node": "10.9.1",
"typescript": "4.7.4"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "5.30.5",
"@typescript-eslint/eslint-plugin": "5.32.0",
"eslint-plugin-react": "7.30.1"
},
"alias": {
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/AccountPage/Features/AccountSummary/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AlertBox } from 'app/components/AlertBox'
import { AmountFormatter } from 'app/components/AmountFormatter'
import { AnchorLink } from 'app/components/AnchorLink'
import { Box, ResponsiveContext, Text } from 'grommet'
import QRCode from 'qrcode.react'
import { QRCodeCanvas } from 'qrcode.react'
import * as React from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { useSelector } from 'react-redux'
Expand Down Expand Up @@ -154,7 +154,7 @@ export function AccountSummary({ address, balance, walletAddress, walletIsOpen }

{!isMobile && (
<Box align="end" flex>
<QRCode
<QRCodeCanvas
value={address}
fgColor={theme === 'light' ? '#333333' : '#e8e8e8'}
bgColor="#00000000"
Expand Down
4 changes: 3 additions & 1 deletion src/app/pages/AccountPage/__tests__/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import { stakingActions } from 'app/state/staking'
import { WalletErrors } from 'types/errors'

jest.unmock('react-i18next')
jest.mock('qrcode.react', () => () => '')
jest.mock('qrcode.react', () => ({
QRCodeCanvas: () => <>QRCodeCanvasMock</>,
}))
jest.mock('react-redux', () => ({
...jest.requireActual('react-redux'),
useDispatch: jest.fn(),
Expand Down
Loading

0 comments on commit 8cc6b02

Please sign in to comment.