diff --git a/src/components/Icon/BrandAssets.js b/src/components/Icon/BrandAssets.js deleted file mode 100644 index 4387caada298..000000000000 --- a/src/components/Icon/BrandAssets.js +++ /dev/null @@ -1,6 +0,0 @@ -import ExpensifyCashLogo from '../../../assets/images/expensify-cash.svg'; - -export { - // eslint-disable-next-line import/prefer-default-export - ExpensifyCashLogo, -}; diff --git a/src/components/Icon/index.js b/src/components/Icon/index.js index ab2830442912..34e1b6c410fd 100644 --- a/src/components/Icon/index.js +++ b/src/components/Icon/index.js @@ -3,14 +3,11 @@ import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; import themeColors from '../../styles/themes/default'; import variables from '../../styles/variables'; -import * as BrandAssets from './BrandAssets'; import * as Expensicons from './Expensicons'; -const ICONS = _.extend(BrandAssets, Expensicons); - const propTypes = { // The asset to render. - src: PropTypes.oneOf(_.values(ICONS)).isRequired, + src: PropTypes.oneOf(_.values(Expensicons)).isRequired, // The width of the icon. width: PropTypes.number, @@ -26,7 +23,7 @@ const propTypes = { const defaultProps = { width: variables.iconSizeNormal, height: variables.iconSizeNormal, - fill: undefined, + fill: themeColors.icon, }; // We must use a class component to create an animatable component with the Animated API @@ -34,18 +31,11 @@ const defaultProps = { class Icon extends PureComponent { render() { const IconToRender = this.props.src; - - // Expensicons have a default fill color, but brand assets do not - let fillColor = this.props.fill; - if (!fillColor && _.contains(_.values(Expensicons), this.props.src)) { - fillColor = themeColors.icon; - } - return ( ); } diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js index 41037da7725d..b259139e69bb 100644 --- a/src/pages/SetPasswordPage.js +++ b/src/pages/SetPasswordPage.js @@ -13,8 +13,7 @@ import lodashHas from 'lodash.has'; import compose from '../libs/compose'; import {Redirect, withRouter} from '../libs/Router'; import styles from '../styles/styles'; -import Icon from '../components/Icon'; -import {ExpensifyCashLogo} from '../components/Icon/BrandAssets'; +import ExpensifyCashLogo from '../../assets/images/expensify-cash.svg'; import CustomStatusBar from '../components/CustomStatusBar'; import {setPassword} from '../libs/actions/Session'; import ONYXKEYS from '../ONYXKEYS'; @@ -95,8 +94,7 @@ class SetPasswordPage extends Component { - diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js index ca66b45147cf..e3e70ea20b57 100644 --- a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js +++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js @@ -5,8 +5,7 @@ import { import PropTypes from 'prop-types'; import styles from '../../../styles/styles'; import variables from '../../../styles/variables'; -import Icon from '../../../components/Icon'; -import {ExpensifyCashLogo} from '../../../components/Icon/BrandAssets'; +import ExpensifyCashLogo from '../../../../assets/images/expensify-cash.svg'; const propTypes = { // The children to show inside the layout @@ -18,11 +17,7 @@ const SignInPageLayoutNarrow = ({children}) => ( - + diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js index c9bf2d16544f..d2bfce6cdb44 100644 --- a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js +++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js @@ -4,8 +4,7 @@ import { } from 'react-native'; import PropTypes from 'prop-types'; import styles from '../../../styles/styles'; -import Icon from '../../../components/Icon'; -import {ExpensifyCashLogo} from '../../../components/Icon/BrandAssets'; +import ExpensifyCashLogo from '../../../../assets/images/expensify-cash.svg'; import welcomeScreenshot from '../../../../assets/images/welcome-screenshot-wide.png'; import variables from '../../../styles/variables'; @@ -28,11 +27,7 @@ const SignInPageLayoutWide = ({children}) => ( - +