Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

About tab copy changes; Update route for Info & Help in account menu #6356

Merged
merged 1 commit into from
Mar 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
"providerRequestInfo": {
"message": "This site is requesting access to view your current account address. Always make sure you trust the sites you interact with."
},
"about": {
"message": "About"
},
"aboutSettingsDescription": {
"message": "Version, support center, and contact info."
},
"aboutUs": {
"message": "About Us"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display
import { PRIMARY } from '../../../helpers/constants/common'
import {
SETTINGS_ROUTE,
INFO_ROUTE,
ABOUT_US_ROUTE,
NEW_ACCOUNT_ROUTE,
IMPORT_ACCOUNT_ROUTE,
CONNECT_HARDWARE_ROUTE,
Expand Down Expand Up @@ -307,7 +307,7 @@ export default class AccountMenu extends PureComponent {
<Item
onClick={() => {
toggleAccountMenu()
history.push(INFO_ROUTE)
history.push(ABOUT_US_ROUTE)
}}
icon={
<img src="images/mm-info-icon.svg" />
Expand Down
4 changes: 2 additions & 2 deletions ui/app/pages/settings/settings.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ROUTES_TO_I18N_KEYS = {
[GENERAL_ROUTE]: 'general',
[ADVANCED_ROUTE]: 'advanced',
[SECURITY_ROUTE]: 'securityAndPrivacy',
[ABOUT_US_ROUTE]: 'aboutUs',
[ABOUT_US_ROUTE]: 'about',
}

export default class SettingsPage extends PureComponent {
Expand Down Expand Up @@ -92,7 +92,7 @@ export default class SettingsPage extends PureComponent {
{ content: t('general'), description: t('generalSettingsDescription'), key: GENERAL_ROUTE },
{ content: t('advanced'), description: t('advancedSettingsDescription'), key: ADVANCED_ROUTE },
{ content: t('securityAndPrivacy'), description: t('securitySettingsDescription'), key: SECURITY_ROUTE },
{ content: t('aboutUs'), key: ABOUT_US_ROUTE },
{ content: t('about'), description: t('aboutSettingsDescription'), key: ABOUT_US_ROUTE },
]}
isActive={key => {
if (key === GENERAL_ROUTE && this.isCurrentPath(SETTINGS_ROUTE)) {
Expand Down