diff --git a/app/build-types/mmi/images/compliance-logo-small.svg b/app/build-types/mmi/images/compliance-logo-small.svg deleted file mode 100644 index 560b0b2a9..000000000 --- a/app/build-types/mmi/images/compliance-logo-small.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/app/build-types/mmi/images/compliance-logo.png b/app/build-types/mmi/images/compliance-logo.png deleted file mode 100644 index 23250fd4a..000000000 Binary files a/app/build-types/mmi/images/compliance-logo.png and /dev/null differ diff --git a/app/build-types/mmi/images/icons/compliance.svg b/app/build-types/mmi/images/icons/compliance.svg deleted file mode 100644 index 9269d3afb..000000000 --- a/app/build-types/mmi/images/icons/compliance.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js index 70c08fb67..c5c9e469b 100644 --- a/ui/components/multichain/app-header/app-header.js +++ b/ui/components/multichain/app-header/app-header.js @@ -44,6 +44,7 @@ import { getTestNetworkBackgroundColor, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) getSelectedAddress, + getTheme, ///: END:ONLY_INCLUDE_IN } from '../../../selectors'; import { GlobalMenu, ProductTour, AccountPicker } from '..'; @@ -79,6 +80,7 @@ export const AppHeader = ({ location }) => { const custodianIcon = useSelector((state) => getCustodianIconForAddress(state, selectedAddress), ); + const theme = useSelector((state) => getTheme(state)); ///: END:ONLY_INCLUDE_IN // Used for account picker @@ -171,6 +173,7 @@ export const AppHeader = ({ location }) => { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) custodyImgSrc={custodianIcon} isUnlocked={isUnlocked} + theme={theme} ///: END:ONLY_INCLUDE_IN /> diff --git a/ui/components/ui/metafox-logo/horizontal-logo.js b/ui/components/ui/metafox-logo/horizontal-logo.js index c76c63854..f9b9fe830 100644 --- a/ui/components/ui/metafox-logo/horizontal-logo.js +++ b/ui/components/ui/metafox-logo/horizontal-logo.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; const LOGO_WIDTH = 162; @@ -9,7 +9,24 @@ const FLASK_PILL_TEXT = 'var(--color-overlay-inverse)'; const BETA_PILL_BACKGROUND = 'var(--color-primary-default)'; const BETA_PIL_TEXT = 'var(--color-primary-inverse)'; -export default function MetaFoxHorizontalLogo({ className }) { +export default function MetaFoxHorizontalLogo({ + theme: themeProps, + className, +}) { + const [theme, setTheme] = useState(() => + themeProps === undefined + ? document.documentElement.getAttribute('data-theme') + : themeProps, + ); + + useEffect(() => { + if (themeProps !== undefined) { + setTheme(themeProps); + } + }, [themeProps]); + + const fill = theme === 'dark' ? 'rgb(255,255,255)' : 'rgb(22,22,22)'; + switch (process.env.METAMASK_BUILD_TYPE) { case 'beta': return ( @@ -716,44 +733,44 @@ export default function MetaFoxHorizontalLogo({ className }) { y="4.847" width="2.481" height="61.306" - style={{ fill: 'rgb(22,22,22)' }} + style={{ fill }} /> ( { - ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-mmi) + ///: BEGIN:ONLY_INCLUDE_IN(build-main) ///: END:ONLY_INCLUDE_IN } + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + + ///: END:ONLY_INCLUDE_IN + }
{ diff --git a/ui/pages/home/institutional/institutional-home-footer.js b/ui/pages/home/institutional/institutional-home-footer.js new file mode 100644 index 000000000..46e9c07a9 --- /dev/null +++ b/ui/pages/home/institutional/institutional-home-footer.js @@ -0,0 +1,59 @@ +import React, { useContext } from 'react'; +import PropTypes from 'prop-types'; +import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils'; +import { useI18nContext } from '../../../hooks/useI18nContext'; +import { + MetaMetricsContextProp, + MetaMetricsEventCategory, + MetaMetricsEventName, +} from '../../../../shared/constants/metametrics'; +import { MetaMetricsContext } from '../../../contexts/metametrics'; +import { ButtonLink, IconName } from '../../../components/component-library'; +import { Display, Size } from '../../../helpers/constants/design-system'; + +const InstitutionalHomeFooter = ({ activitySupportDisplayStyle }) => { + const t = useI18nContext(); + const trackEvent = useContext(MetaMetricsContext); + + return ( + { + trackEvent( + { + category: MetaMetricsEventCategory.Home, + event: MetaMetricsEventName.SupportLinkClicked, + properties: { + url: SUPPORT_LINK, + }, + }, + { + contextPropsIntoEventProperties: [MetaMetricsContextProp.PageTitle], + }, + ); + }} + externalLink + > + {`${t('appNameMmi')} ${t('support').toLowerCase()}`} + + ); +}; + +InstitutionalHomeFooter.propTypes = { + activitySupportDisplayStyle: PropTypes.shape({ + justifyContent: PropTypes.string.isRequired, + paddingLeft: PropTypes.string, + marginBottom: PropTypes.string, + marginTop: PropTypes.string, + }).isRequired, +}; + +export default InstitutionalHomeFooter; diff --git a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js index 07fdf345b..a7c134e91 100644 --- a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js +++ b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js @@ -50,16 +50,17 @@ export default function InstitutionalEntityDonePage(props) { marginTop={4} marginBottom={4} color={TextColor.textDefault} + textAlign={TextAlign.Left} > {state.title} {state.description} diff --git a/ui/pages/unlock-page/unlock-page.component.js b/ui/pages/unlock-page/unlock-page.component.js index 6410d2674..df1121016 100644 --- a/ui/pages/unlock-page/unlock-page.component.js +++ b/ui/pages/unlock-page/unlock-page.component.js @@ -155,6 +155,12 @@ export default class UnlockPage extends Component { const { t } = this.context; const { onRestore } = this.props; + let needHelpText = t('appNameMmi'); + + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) + needHelpText = t('needHelpLinkText'); + ///: END:ONLY_INCLUDE_IN + return (
@@ -222,7 +228,7 @@ export default class UnlockPage extends Component { ); }} > - {t('needHelpLinkText')} + {needHelpText} , ])}