mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-24 02:58:09 +01:00
d8a4b7fc9b
When disabling an alert, the background `alertEnabledness` state of the alert was being set to `undefined` instead of `false`. This didn't have any user-facing effect, since `undefined` is falsey, but it did result in a PropType error on the Alert settings page. This mistake was made in #8550. The `alertEnabledness` state is now correctly set to `false` instead of `undefined`.
123 lines
3.0 KiB
JavaScript
123 lines
3.0 KiB
JavaScript
import { createSlice } from '@reduxjs/toolkit'
|
|
import { captureException } from '@sentry/browser'
|
|
|
|
import { ALERT_TYPES } from '../../../../app/scripts/controllers/alert'
|
|
import * as actionConstants from '../../store/actionConstants'
|
|
import { addPermittedAccount, setAlertEnabledness } from '../../store/actions'
|
|
import {
|
|
getOriginOfCurrentTab,
|
|
getSelectedAddress,
|
|
} from '../../selectors'
|
|
|
|
// Constants
|
|
|
|
export const ALERT_STATE = {
|
|
CLOSED: 'CLOSED',
|
|
ERROR: 'ERROR',
|
|
LOADING: 'LOADING',
|
|
OPEN: 'OPEN',
|
|
}
|
|
|
|
const name = ALERT_TYPES.unconnectedAccount
|
|
|
|
const initialState = {
|
|
state: ALERT_STATE.CLOSED,
|
|
}
|
|
|
|
// Slice (reducer plus auto-generated actions and action creators)
|
|
|
|
const slice = createSlice({
|
|
name,
|
|
initialState,
|
|
reducers: {
|
|
connectAccountFailed: (state) => {
|
|
state.state = ALERT_STATE.ERROR
|
|
},
|
|
connectAccountRequested: (state) => {
|
|
state.state = ALERT_STATE.LOADING
|
|
},
|
|
connectAccountSucceeded: (state) => {
|
|
state.state = ALERT_STATE.CLOSED
|
|
},
|
|
dismissAlert: (state) => {
|
|
state.state = ALERT_STATE.CLOSED
|
|
},
|
|
disableAlertFailed: (state) => {
|
|
state.state = ALERT_STATE.ERROR
|
|
},
|
|
disableAlertRequested: (state) => {
|
|
state.state = ALERT_STATE.LOADING
|
|
},
|
|
disableAlertSucceeded: (state) => {
|
|
state.state = ALERT_STATE.CLOSED
|
|
},
|
|
switchedToUnconnectedAccount: (state) => {
|
|
state.state = ALERT_STATE.OPEN
|
|
},
|
|
},
|
|
extraReducers: {
|
|
[actionConstants.SELECTED_ADDRESS_CHANGED]: (state) => {
|
|
// close the alert if the account is switched while it's open
|
|
if (state.state === ALERT_STATE.OPEN) {
|
|
state.state = ALERT_STATE.CLOSED
|
|
}
|
|
},
|
|
},
|
|
})
|
|
|
|
const { actions, reducer } = slice
|
|
|
|
export default reducer
|
|
|
|
// Selectors
|
|
|
|
export const getAlertState = (state) => state[name].state
|
|
|
|
export const alertIsOpen = (state) => state[name].state !== ALERT_STATE.CLOSED
|
|
|
|
// Actions / action-creators
|
|
|
|
const {
|
|
connectAccountFailed,
|
|
connectAccountRequested,
|
|
connectAccountSucceeded,
|
|
dismissAlert,
|
|
disableAlertFailed,
|
|
disableAlertRequested,
|
|
disableAlertSucceeded,
|
|
switchedToUnconnectedAccount,
|
|
} = actions
|
|
|
|
export { dismissAlert, switchedToUnconnectedAccount }
|
|
|
|
export const dismissAndDisableAlert = () => {
|
|
return async (dispatch) => {
|
|
try {
|
|
await dispatch(disableAlertRequested())
|
|
await dispatch(setAlertEnabledness(name, false))
|
|
await dispatch(disableAlertSucceeded())
|
|
} catch (error) {
|
|
console.error(error)
|
|
captureException(error)
|
|
await dispatch(disableAlertFailed())
|
|
}
|
|
}
|
|
}
|
|
|
|
export const connectAccount = () => {
|
|
return async (dispatch, getState) => {
|
|
const state = getState()
|
|
const selectedAddress = getSelectedAddress(state)
|
|
const origin = getOriginOfCurrentTab(state)
|
|
try {
|
|
await dispatch(connectAccountRequested())
|
|
await dispatch(addPermittedAccount(origin, selectedAddress))
|
|
await dispatch(connectAccountSucceeded())
|
|
} catch (error) {
|
|
console.error(error)
|
|
captureException(error)
|
|
await dispatch(connectAccountFailed())
|
|
}
|
|
}
|
|
}
|