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

add useI18nContext shortcut hook (#8635)

Browse Source
This commit is contained in:
Brad Decker 2020-05-21 10:26:49 -05:00 committed by GitHub
parent 9e2e353a24
commit f9ea9b541a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/components/app/alerts/switch-to-connected-alert/switch-to-connected-alert.js
View File

@ -1,4 +1,4 @@
import React, { useContext, useState } from 'react'
import React, { useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import {
@ -9,12 +9,12 @@ import {
getAlertState,
} from '../../../../ducks/alerts/switch-to-connected'
import { getPermittedIdentitiesForCurrentTab } from '../../../../selectors'
import { I18nContext } from '../../../../contexts/i18n'
import Popover from '../../../ui/popover'
import Button from '../../../ui/button'
import Dropdown from '../../../ui/dropdown'
import Checkbox from '../../../ui/check-box'
import Tooltip from '../../../ui/tooltip-v2'
import { useI18nContext } from '../../../../hooks/useI18nContext'
const {
ERROR,
@ -22,7 +22,7 @@ const {
} = ALERT_STATE
const SwitchToUnconnectedAccountAlert = () => {
const t = useContext(I18nContext)
const t = useI18nContext()
const dispatch = useDispatch()
const alertState = useSelector(getAlertState)
const connectedAccounts = useSelector(getPermittedIdentitiesForCurrentTab)

6
ui/app/components/app/alerts/unconnected-account-alert/unconnected-account-alert.js
View File

@ -1,4 +1,4 @@
import React, { useContext, useState } from 'react'
import React, { useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import {
@ -8,12 +8,12 @@ import {
dismissAndDisableAlert,
getAlertState,
} from '../../../../ducks/alerts/unconnected-account'
import { I18nContext } from '../../../../contexts/i18n'
import Popover from '../../../ui/popover'
import Button from '../../../ui/button'
import Checkbox from '../../../ui/check-box'
import Tooltip from '../../../ui/tooltip-v2'
import { getSelectedIdentity, getOriginOfCurrentTab } from '../../../../selectors'
import { useI18nContext } from '../../../../hooks/useI18nContext'
const {
ERROR,
@ -21,7 +21,7 @@ const {
} = ALERT_STATE
const SwitchToUnconnectedAccountAlert = () => {
const t = useContext(I18nContext)
const t = useI18nContext()
const dispatch = useDispatch()
const alertState = useSelector(getAlertState)
const origin = useSelector(getOriginOfCurrentTab)

6
ui/app/components/ui/popover/popover.component.js
View File

@ -1,8 +1,8 @@
import React, { PureComponent, useContext } from 'react'
import React, { PureComponent } from 'react'
import ReactDOM from 'react-dom'
import PropTypes from 'prop-types'
import classnames from 'classnames'
import { I18nContext } from '../../../contexts/i18n'
import { useI18nContext } from '../../../hooks/useI18nContext'
const Popover = ({
title,
@ -17,7 +17,7 @@ const Popover = ({
showArrow,
CustomBackground,
}) => {
const t = useContext(I18nContext)
const t = useI18nContext()
return (
<div className="popover-container">
{ CustomBackground

13
ui/app/hooks/useI18nContext.js Normal file
View File

@ -0,0 +1,13 @@
import { useContext } from 'react'
import { I18nContext } from '../contexts/i18n'
/**
* useI18ncContext
*
* A time saving shortcut to using useContext + I18ncontext in many
* different places.
* @return {Function} I18n function from contexts/I18n.js
*/
export function useI18nContext () {
return useContext(I18nContext)
}

8
ui/app/pages/settings/alerts-tab/alerts-tab.js
View File

@ -1,16 +1,16 @@
import React, { useContext } from 'react'
import React from 'react'
import PropTypes from 'prop-types'
import { useDispatch, useSelector } from 'react-redux'
import { ALERT_TYPES } from '../../../../../app/scripts/controllers/alert'
import { I18nContext } from '../../../contexts/i18n'
import Tooltip from '../../../components/ui/tooltip-v2'
import ToggleButton from '../../../components/ui/toggle-button'
import { setAlertEnabledness } from '../../../store/actions'
import { getAlertEnabledness } from '../../../ducks/metamask/metamask'
import { useI18nContext } from '../../../hooks/useI18nContext'
const AlertSettingsEntry = ({ alertId, description, title }) => {
const t = useContext(I18nContext)
const t = useI18nContext()
const dispatch = useDispatch()
const isEnabled = useSelector((state) => getAlertEnabledness(state)[alertId])
@ -43,7 +43,7 @@ AlertSettingsEntry.propTypes = {
}
const AlertsTab = () => {
const t = useContext(I18nContext)
const t = useI18nContext()
const alertConfig = {
[ALERT_TYPES.switchToConnected]: {