m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Swaps timer improvements, optional refresh rates and fix for a notification UI (#14300)

Browse Source 
* Set up correct timer value for fetching new quotes

* Show red timer in Swaps if quotes fetching will happen in less than 10s (previously it was 30s)

* Fix a UI issue with the notification close button

* Make stx refresh rates optional, since not every network supports them
This commit is contained in:
Daniel 2022-04-04 15:14:50 +02:00 committed by GitHub
parent 96610742ce
commit fc17fbe1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/controllers/swaps.js
View File

@ -139,9 +139,7 @@ export default class SwapsController {
if ( if (
!refreshRates || !refreshRates ||
typeof refreshRates.quotes !== 'number' || typeof refreshRates.quotes !== 'number' ||
typeof refreshRates.quotesPrefetching !== 'number' || typeof refreshRates.quotesPrefetching !== 'number'
typeof refreshRates.stxGetTransactions !== 'number' ||
typeof refreshRates.stxBatchStatus !== 'number'
) { ) {
throw new Error( throw new Error(
`MetaMask - invalid response for refreshRates: ${response}`, `MetaMask - invalid response for refreshRates: ${response}`,

13
ui/pages/swaps/countdown-timer/countdown-timer.js
View File

@ -5,7 +5,10 @@ import classnames from 'classnames';
import { Duration } from 'luxon'; import { Duration } from 'luxon';
import { I18nContext } from '../../../contexts/i18n'; import { I18nContext } from '../../../contexts/i18n';
import InfoTooltip from '../../../components/ui/info-tooltip'; import InfoTooltip from '../../../components/ui/info-tooltip';
import { getSwapsQuoteRefreshTime } from '../../../ducks/swaps/swaps'; import {
getSwapsQuoteRefreshTime,
getSwapsQuotePrefetchingRefreshTime,
} from '../../../ducks/swaps/swaps';
import { SECOND } from '../../../../shared/constants/time'; import { SECOND } from '../../../../shared/constants/time';
import TimerIcon from './timer-icon'; import TimerIcon from './timer-icon';
@ -43,7 +46,13 @@ export default function CountdownTimer({
const initialTimeStartedRef = useRef(); const initialTimeStartedRef = useRef();
const swapsQuoteRefreshTime = useSelector(getSwapsQuoteRefreshTime); const swapsQuoteRefreshTime = useSelector(getSwapsQuoteRefreshTime);
const timerStart = Number(timerBase) || swapsQuoteRefreshTime; const swapsQuotePrefetchingRefreshTime = useSelector(
getSwapsQuotePrefetchingRefreshTime,
);
const refreshTime = initialTimeStartedRef.current
? swapsQuoteRefreshTime
: swapsQuotePrefetchingRefreshTime;
const timerStart = Number(timerBase) || refreshTime;
const [currentTime, setCurrentTime] = useState(() => Date.now()); const [currentTime, setCurrentTime] = useState(() => Date.now());
const [timer, setTimer] = useState(() => const [timer, setTimer] = useState(() =>

2
ui/pages/swaps/index.scss
View File

@ -121,7 +121,7 @@
flex: 1; flex: 1;
} }
&__notification-close-button { .actionable-message__message &__notification-close-button {
background-color: transparent; background-color: transparent;
position: absolute; position: absolute;
right: 0; right: 0;

2
ui/pages/swaps/view-quote/view-quote.js
View File

@ -955,7 +955,7 @@ export default function ViewQuote() {
<div className="view-quote__countdown-timer-container"> <div className="view-quote__countdown-timer-container">
<CountdownTimer <CountdownTimer
timeStarted={quotesLastFetched} timeStarted={quotesLastFetched}
warningTime="0:30" warningTime="0:10"
labelKey="swapNewQuoteIn" labelKey="swapNewQuoteIn"
/> />
</div> </div>