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

Dark Mode: Remove feature flag (#14207)

Browse Source
This commit is contained in:
David Walsh 2022-03-25 20:42:52 -05:00 committed by GitHub
parent a7ac83f9d3
commit 7f239997dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/build/scripts.js
View File

@ -34,7 +34,6 @@ const metamaskrc = require('rc')('metamask', {
INFURA_PROD_PROJECT_ID: process.env.INFURA_PROD_PROJECT_ID, INFURA_PROD_PROJECT_ID: process.env.INFURA_PROD_PROJECT_ID,
ONBOARDING_V2: process.env.ONBOARDING_V2, ONBOARDING_V2: process.env.ONBOARDING_V2,
COLLECTIBLES_V1: process.env.COLLECTIBLES_V1, COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
DARK_MODE_V1: process.env.DARK_MODE_V1,
TOKEN_DETECTION_V2: process.env.TOKEN_DETECTION_V2, TOKEN_DETECTION_V2: process.env.TOKEN_DETECTION_V2,
SEGMENT_HOST: process.env.SEGMENT_HOST, SEGMENT_HOST: process.env.SEGMENT_HOST,
SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY, SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY,
@ -812,7 +811,6 @@ function getEnvironmentVariables({ buildType, devMode, testing, version }) {
SWAPS_USE_DEV_APIS: process.env.SWAPS_USE_DEV_APIS === '1', SWAPS_USE_DEV_APIS: process.env.SWAPS_USE_DEV_APIS === '1',
ONBOARDING_V2: metamaskrc.ONBOARDING_V2 === '1', ONBOARDING_V2: metamaskrc.ONBOARDING_V2 === '1',
COLLECTIBLES_V1: metamaskrc.COLLECTIBLES_V1 === '1', COLLECTIBLES_V1: metamaskrc.COLLECTIBLES_V1 === '1',
DARK_MODE_V1: metamaskrc.DARK_MODE_V1 === '1',
TOKEN_DETECTION_V2: metamaskrc.TOKEN_DETECTION_V2 === '1', TOKEN_DETECTION_V2: metamaskrc.TOKEN_DETECTION_V2 === '1',
}; };
} }

14
ui/pages/routes/routes.component.js
View File

@ -105,11 +105,9 @@ export default class Routes extends Component {
}; };
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (process.env.DARK_MODE_V1) { const { theme } = this.props;
const { theme } = this.props; if (theme !== prevProps.theme) {
if (theme !== prevProps.theme) { document.documentElement.setAttribute('data-theme', theme);
document.documentElement.setAttribute('data-theme', theme);
}
} }
} }
@ -130,9 +128,7 @@ export default class Routes extends Component {
pageChanged(locationObj.pathname); pageChanged(locationObj.pathname);
} }
}); });
if (process.env.DARK_MODE_V1 && theme) { document.documentElement.setAttribute('data-theme', theme);
document.documentElement.setAttribute('data-theme', theme);
}
} }
renderRoutes() { renderRoutes() {
@ -333,7 +329,6 @@ export default class Routes extends Component {
isMouseUser, isMouseUser,
browserEnvironmentOs: os, browserEnvironmentOs: os,
browserEnvironmentBrowser: browser, browserEnvironmentBrowser: browser,
theme,
} = this.props; } = this.props;
const loadMessage = const loadMessage =
loadingMessage || isNetworkLoading loadingMessage || isNetworkLoading
@ -345,7 +340,6 @@ export default class Routes extends Component {
[`os-${os}`]: os, [`os-${os}`]: os,
[`browser-${browser}`]: browser, [`browser-${browser}`]: browser,
'mouse-user-styles': isMouseUser, 'mouse-user-styles': isMouseUser,
[`theme-${theme}`]: process.env.DARK_MODE_V1 && theme,
})} })}
dir={textDirection} dir={textDirection}
onClick={() => setMouseUserState(true)} onClick={() => setMouseUserState(true)}

6
ui/pages/settings/experimental-tab/experimental-tab.component.js
View File

@ -9,9 +9,6 @@ import Dropdown from '../../../components/ui/dropdown';
import { THEME_TYPE } from './experimental-tab.constant'; import { THEME_TYPE } from './experimental-tab.constant';
/*eslint-disable prefer-destructuring*/
const DARK_MODE_V1 = process.env.DARK_MODE_V1;
export default class ExperimentalTab extends PureComponent { export default class ExperimentalTab extends PureComponent {
static contextTypes = { static contextTypes = {
t: PropTypes.func, t: PropTypes.func,
@ -229,9 +226,6 @@ export default class ExperimentalTab extends PureComponent {
} }
renderTheme() { renderTheme() {
if (!DARK_MODE_V1) {
return null;
}
const { t } = this.context; const { t } = this.context;
const { theme, setTheme } = this.props; const { theme, setTheme } = this.props;