diff options
author | Dan J Miller <danjm.com@gmail.com> | 2019-03-26 00:13:23 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-26 00:13:23 +0800 |
commit | 961ad267df93cbb3fc61d0a999bd78f132c877b1 (patch) | |
tree | 6186b2c88a343d5df98db3c2f6ea381c80df4ef5 /ui/app/pages/settings/settings-tab/settings-tab.container.js | |
parent | 4ff9126ff2fddba40d3f210c757796458528ef42 (diff) | |
download | tangerine-wallet-browser-961ad267df93cbb3fc61d0a999bd78f132c877b1.tar.gz tangerine-wallet-browser-961ad267df93cbb3fc61d0a999bd78f132c877b1.tar.zst tangerine-wallet-browser-961ad267df93cbb3fc61d0a999bd78f132c877b1.zip |
New settings page rebased (#6333)
* New setting tab
* Add InfoTab
* Add Advanced tab
* Add Security Tab
* Finish mobile view
* Make new setting page responsive
* Fix linter
* Fix y scrolling
* Update link in network dropdown
* Fix e2e tests
* Remove duplicate translation key
* Resolve merge conflict
* Only change settings header in popup view.
* Place mobile-sync button in advanced-tab of settings
Diffstat (limited to 'ui/app/pages/settings/settings-tab/settings-tab.container.js')
-rw-r--r-- | ui/app/pages/settings/settings-tab/settings-tab.container.js | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/ui/app/pages/settings/settings-tab/settings-tab.container.js b/ui/app/pages/settings/settings-tab/settings-tab.container.js index 3ae4985d7..d3d8457f0 100644 --- a/ui/app/pages/settings/settings-tab/settings-tab.container.js +++ b/ui/app/pages/settings/settings-tab/settings-tab.container.js @@ -4,15 +4,10 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { setCurrentCurrency, - updateAndSetCustomRpc, displayWarning, - revealSeedConfirmation, setUseBlockie, updateCurrentLocale, - setFeatureFlag, - showModal, setUseNativeCurrencyAsPrimaryCurrencyPreference, - setShowFiatConversionOnTestnetsPreference, setParticipateInMetaMetrics, } from '../../../store/actions' import { preferencesSelector } from '../../../selectors/selectors' @@ -24,16 +19,9 @@ const mapStateToProps = state => { conversionDate, nativeCurrency, useBlockie, - featureFlags: { - sendHexData, - privacyMode, - advancedInlineGas, - } = {}, - provider = {}, currentLocale, - participateInMetaMetrics, } = metamask - const { useNativeCurrencyAsPrimaryCurrency, showFiatInTestnets } = preferencesSelector(state) + const { useNativeCurrencyAsPrimaryCurrency } = preferencesSelector(state) return { warning, @@ -42,35 +30,19 @@ const mapStateToProps = state => { conversionDate, nativeCurrency, useBlockie, - sendHexData, - advancedInlineGas, - privacyMode, - provider, useNativeCurrencyAsPrimaryCurrency, - showFiatInTestnets, - participateInMetaMetrics, } } const mapDispatchToProps = dispatch => { return { setCurrentCurrency: currency => dispatch(setCurrentCurrency(currency)), - setRpcTarget: (newRpc, chainId, ticker, nickname) => dispatch(updateAndSetCustomRpc(newRpc, chainId, ticker, nickname)), displayWarning: warning => dispatch(displayWarning(warning)), - revealSeedConfirmation: () => dispatch(revealSeedConfirmation()), setUseBlockie: value => dispatch(setUseBlockie(value)), updateCurrentLocale: key => dispatch(updateCurrentLocale(key)), - setHexDataFeatureFlag: shouldShow => dispatch(setFeatureFlag('sendHexData', shouldShow)), - setAdvancedInlineGasFeatureFlag: shouldShow => dispatch(setFeatureFlag('advancedInlineGas', shouldShow)), - setPrivacyMode: enabled => dispatch(setFeatureFlag('privacyMode', enabled)), - showResetAccountConfirmationModal: () => dispatch(showModal({ name: 'CONFIRM_RESET_ACCOUNT' })), setUseNativeCurrencyAsPrimaryCurrencyPreference: value => { return dispatch(setUseNativeCurrencyAsPrimaryCurrencyPreference(value)) }, - setShowFiatConversionOnTestnetsPreference: value => { - return dispatch(setShowFiatConversionOnTestnetsPreference(value)) - }, - showClearApprovalModal: () => dispatch(showModal({ name: 'CLEAR_APPROVED_ORIGINS' })), setParticipateInMetaMetrics: (val) => dispatch(setParticipateInMetaMetrics(val)), } } |