mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-26 20:39:08 +01:00
bd12ea733a
The autolock field on the Settings screen — the field that allows users
to set the duration that MetaMask will wait for until automatically
locking — does not always accept decimal numbers. This breaks the e2e
test for this feature as it attempts to set this field to "0.1".
More specifically, the React component responsible for this field passes
whatever the user inputs through the `Number` function immediately and
then uses this to repopulate the input. Therefore, if the user enters
"3" followed by a ".", `Number("3.")` will be called. This evaluates to
the number 3, and "3" becomes the new value of the field. As a result,
the "." can never be typed.
Curiously, this behavior only happens in Firefox; Chrome seems to
keep the "." in the input field when it's typed. This happens because
`onChange` event doesn't seem to get fired until a number is typed
*after* the ".". This may be due to underlying differences in the DOM
between Chrome and Firefox.
Regardless, always passing the input through `Number` creates other odd
behavior, such as the fact that the input can never be cleared (because
`Number("")` evaluates to 0).
This commit solves these problems by saving the "raw" version of the
user's input as well as the normalized version. The raw version is
always used to populate the input, whereas the normalized version is
saved in state.
87 lines
3.0 KiB
JavaScript
87 lines
3.0 KiB
JavaScript
import { connect } from 'react-redux';
|
|
import { withRouter } from 'react-router-dom';
|
|
import { compose } from 'redux';
|
|
import {
|
|
getAllAccountsOnNetworkAreEmpty,
|
|
getIsNetworkUsed,
|
|
getNetworkIdentifier,
|
|
getPreferences,
|
|
isNetworkLoading,
|
|
getTheme,
|
|
getIsTestnet,
|
|
getCurrentChainId,
|
|
getShouldShowSeedPhraseReminder,
|
|
isCurrentProviderCustom,
|
|
} from '../../selectors';
|
|
import {
|
|
lockMetamask,
|
|
setCurrentCurrency,
|
|
setLastActiveTime,
|
|
setMouseUserState,
|
|
toggleAccountMenu,
|
|
toggleNetworkMenu,
|
|
} from '../../store/actions';
|
|
import { pageChanged } from '../../ducks/history/history';
|
|
import { prepareToLeaveSwaps } from '../../ducks/swaps/swaps';
|
|
import { getSendStage } from '../../ducks/send';
|
|
import { getProviderConfig } from '../../ducks/metamask/metamask';
|
|
import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../shared/constants/preferences';
|
|
import Routes from './routes.component';
|
|
|
|
function mapStateToProps(state) {
|
|
const { appState } = state;
|
|
const { alertOpen, alertMessage, isLoading, loadingMessage } = appState;
|
|
const { autoLockTimeLimit = DEFAULT_AUTO_LOCK_TIME_LIMIT } =
|
|
getPreferences(state);
|
|
const { completedOnboarding } = state.metamask;
|
|
|
|
return {
|
|
alertOpen,
|
|
alertMessage,
|
|
textDirection: state.metamask.textDirection,
|
|
isLoading,
|
|
loadingMessage,
|
|
isUnlocked: state.metamask.isUnlocked,
|
|
isNetworkLoading: isNetworkLoading(state),
|
|
currentCurrency: state.metamask.currentCurrency,
|
|
isMouseUser: state.appState.isMouseUser,
|
|
autoLockTimeLimit,
|
|
browserEnvironmentOs: state.metamask.browserEnvironment?.os,
|
|
browserEnvironmentContainter: state.metamask.browserEnvironment?.browser,
|
|
providerId: getNetworkIdentifier(state),
|
|
providerType: getProviderConfig(state).type,
|
|
theme: getTheme(state),
|
|
sendStage: getSendStage(state),
|
|
isNetworkUsed: getIsNetworkUsed(state),
|
|
allAccountsOnNetworkAreEmpty: getAllAccountsOnNetworkAreEmpty(state),
|
|
isTestNet: getIsTestnet(state),
|
|
currentChainId: getCurrentChainId(state),
|
|
shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state),
|
|
forgottenPassword: state.metamask.forgottenPassword,
|
|
isCurrentProviderCustom: isCurrentProviderCustom(state),
|
|
completedOnboarding,
|
|
isAccountMenuOpen: state.metamask.isAccountMenuOpen,
|
|
isNetworkMenuOpen: state.metamask.isNetworkMenuOpen,
|
|
accountDetailsAddress: state.appState.accountDetailsAddress,
|
|
};
|
|
}
|
|
|
|
function mapDispatchToProps(dispatch) {
|
|
return {
|
|
lockMetaMask: () => dispatch(lockMetamask(false)),
|
|
setCurrentCurrencyToUSD: () => dispatch(setCurrentCurrency('usd')),
|
|
setMouseUserState: (isMouseUser) =>
|
|
dispatch(setMouseUserState(isMouseUser)),
|
|
setLastActiveTime: () => dispatch(setLastActiveTime()),
|
|
pageChanged: (path) => dispatch(pageChanged(path)),
|
|
prepareToLeaveSwaps: () => dispatch(prepareToLeaveSwaps()),
|
|
toggleAccountMenu: () => dispatch(toggleAccountMenu()),
|
|
toggleNetworkMenu: () => dispatch(toggleNetworkMenu()),
|
|
};
|
|
}
|
|
|
|
export default compose(
|
|
withRouter,
|
|
connect(mapStateToProps, mapDispatchToProps),
|
|
)(Routes);
|