Merge branch 'update' into 'develop'

Update some dependencies, remove `react-router-scroll-4`

See merge request soapbox-pub/soapbox-fe!1557
This commit is contained in:
marcin mikołajczak
2022-06-23 07:39:40 +00:00
5 changed files with 295 additions and 141 deletions

View File

@@ -1,4 +1,4 @@
import QRCode from 'qrcode.react';
import { QRCodeCanvas as QRCode } from 'qrcode.react';
import React from 'react';
import Icon from 'soapbox/components/icon';

View File

@@ -1,4 +1,4 @@
import QRCode from 'qrcode.react';
import { QRCodeCanvas as QRCode } from 'qrcode.react';
import React, { useCallback, useEffect, useState } from 'react';
import { useIntl, FormattedMessage, defineMessages } from 'react-intl';
import { useHistory } from 'react-router-dom';