mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-10-23 11:46:13 +02:00
e9c7df28ed
* Style Send Header * Move Send to-row to send view and restyle * Add "Recents" group to select recipient view * Rename SendToRow to AddRecipient * Basic UI and Layout * New ENSInput component * wip - fuzzy search for input * small refactor * Add Dialog * contact list initial * initial error on invalid address * clean up edit * Click to open modal * Create AddToAddressBookModal component * Modal styling and layout * modal i18n * Add to Addressbook * ens wip * ens wip * ENS Resolution * Reset input * Send to explicit address * Happy Path Complete * Add back error checking * Reset send-to when emptying input * Add back warning object * Fix linter * Fix unit test #1 - fix import paths * Remove dead tests * One more to go * Fix all unit tests * add unit test for reducers and actions * test rendering AddRecipient * Add tests for dialog boxes in AddRecipient * Add test for validating * Fix linter * Fix e2e tests * Token send e2e fix * Style View Contact * Style edit-contact * Fix e2e * Fix from-import-beta-ui e2e spec * Make section header say "add recipient” by default * Auto-focus add recipient input * Update placeholder text * Update input title font size * Auto advance to next step if user paste a valid address * Ellipsify address when recipient is selected * Fix app header background color on desktop * Give each form row a margin of 16px * Use .container/.component naming pattern for ens-input * Auto-focus on input when add to addressbook modal is opened; Save on Enter * Fix and add unit test * Fix selectors name in e2e tests * Correct e2e test token amount for address-book-send changes * Adds e2e test for editing a transaction * Delete test/integration/lib/send-new-ui.js * Add tests for amount max button and high value error on send screen to test/e2e/metamask-ui.spec.js * lint and revert to address as object keys * add chainId based on current network to address book entry * fix test * only display contacts for the current network * Improve ENS message when not found on current network * Add error to indicate when network does not support ENS * bump gaba * address book, resolve comments * Move contact-list to its own component * De-duplicate getaddressbook selector and refactor name selection logic in contact-list-tab/ * Use contact-list component in contact-list-tab.component (i.e. in settings) * Improve/fix settings headers for popup and browser views * Lint fixes related to address book updates * Add 'My accounts' page to settings address book * Update add new contact button in settings to match floating circular design * Improve styles of view contact page * Improve styles and labels of the add-contact.component * Further lint fixes related to address book updates * Update unit tests as per address book updates * Ensure that contact list groups are sorted alphabetically * Refactor settings component to use a container for connection to redux; allow display of addressbook name in settings header * Decouple ens-input.component from send context * Add ens resolution to add contact screen in settings * Switching networks when an ens address is shown on send form removes the ens address. * Resolve send screen search for ensAddress to matching address book entry if it exists * Show resolved ens icon and address if exists (settings: add-contact.component) * Make the displayed and copied address in view-contact.component the checksummed address * Default alias state prop in AddToAddressBookModal to empty string * Use keyCode to detect enter key in AddToAddressBookModal * Ensure add-contact component properly updates after QR code detection * Fix display of all recents after clicking 'Load More' in contact list * Fix send screen contact searching after network switching * Code cleanup related to address book changes * Update unit tests for address book changes * Update ENS name not found on network message * Add ens registration error message * Cancel on edit mode takes user back to view screen * Adds support for memo to settings contact list view and edit screens * Modify designs of edit and view contact in popup environment * Update settings content list UX to show split columns in fullscreen and proper internal navigation * Correct background address book API usages in UI
93 lines
2.9 KiB
JavaScript
93 lines
2.9 KiB
JavaScript
import Settings from './settings.component'
|
|
import { compose } from 'recompose'
|
|
import { connect } from 'react-redux'
|
|
import { withRouter } from 'react-router-dom'
|
|
import { getAddressBookEntryName } from '../../selectors/selectors'
|
|
import { isValidAddress } from '../../helpers/utils/util'
|
|
import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
|
|
import { getEnvironmentType } from '../../../../app/scripts/lib/util'
|
|
|
|
import {
|
|
ADVANCED_ROUTE,
|
|
SECURITY_ROUTE,
|
|
GENERAL_ROUTE,
|
|
ABOUT_US_ROUTE,
|
|
SETTINGS_ROUTE,
|
|
CONTACT_LIST_ROUTE,
|
|
CONTACT_ADD_ROUTE,
|
|
CONTACT_EDIT_ROUTE,
|
|
CONTACT_VIEW_ROUTE,
|
|
CONTACT_MY_ACCOUNTS_ROUTE,
|
|
CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
|
|
CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
|
|
} from '../../helpers/constants/routes'
|
|
|
|
const ROUTES_TO_I18N_KEYS = {
|
|
[GENERAL_ROUTE]: 'general',
|
|
[ADVANCED_ROUTE]: 'advanced',
|
|
[SECURITY_ROUTE]: 'securityAndPrivacy',
|
|
[ABOUT_US_ROUTE]: 'about',
|
|
[CONTACT_LIST_ROUTE]: 'contactList',
|
|
[CONTACT_ADD_ROUTE]: 'newContact',
|
|
[CONTACT_EDIT_ROUTE]: 'editContact',
|
|
[CONTACT_VIEW_ROUTE]: 'viewContact',
|
|
[CONTACT_MY_ACCOUNTS_ROUTE]: 'myAccounts',
|
|
}
|
|
|
|
const mapStateToProps = (state, ownProps) => {
|
|
const { location } = ownProps
|
|
const { pathname } = location
|
|
const pathNameTail = pathname.match(/[^/]+$/)[0]
|
|
|
|
const isAddressEntryPage = pathNameTail.includes('0x')
|
|
const isMyAccountsPage = pathname.match('my-accounts')
|
|
const isAddContactPage = Boolean(pathname.match(CONTACT_ADD_ROUTE))
|
|
const isEditContactPage = Boolean(pathname.match(CONTACT_EDIT_ROUTE))
|
|
const isEditMyAccountsContactPage = Boolean(pathname.match(CONTACT_MY_ACCOUNTS_EDIT_ROUTE))
|
|
|
|
const isPopupView = getEnvironmentType(location.href) === ENVIRONMENT_TYPE_POPUP
|
|
const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname]
|
|
|
|
let backRoute
|
|
if (isMyAccountsPage && isAddressEntryPage) {
|
|
backRoute = CONTACT_MY_ACCOUNTS_ROUTE
|
|
} else if (isEditContactPage) {
|
|
backRoute = `${CONTACT_VIEW_ROUTE}/${pathNameTail}`
|
|
} else if (isEditMyAccountsContactPage) {
|
|
backRoute = `${CONTACT_MY_ACCOUNTS_VIEW_ROUTE}/${pathNameTail}`
|
|
} else if (isAddressEntryPage || isMyAccountsPage || isAddContactPage) {
|
|
backRoute = CONTACT_LIST_ROUTE
|
|
} else {
|
|
backRoute = SETTINGS_ROUTE
|
|
}
|
|
|
|
let initialBreadCrumbRoute
|
|
let breadCrumbTextKey
|
|
let initialBreadCrumbKey
|
|
if (isMyAccountsPage) {
|
|
initialBreadCrumbRoute = CONTACT_LIST_ROUTE
|
|
breadCrumbTextKey = 'myWalletAccounts'
|
|
initialBreadCrumbKey = ROUTES_TO_I18N_KEYS[initialBreadCrumbRoute]
|
|
}
|
|
|
|
const addressName = getAddressBookEntryName(state, isValidAddress(pathNameTail) ? pathNameTail : '')
|
|
|
|
return {
|
|
isAddressEntryPage,
|
|
isMyAccountsPage,
|
|
backRoute,
|
|
currentPath: pathname,
|
|
isPopupView,
|
|
pathnameI18nKey,
|
|
addressName,
|
|
initialBreadCrumbRoute,
|
|
breadCrumbTextKey,
|
|
initialBreadCrumbKey,
|
|
}
|
|
}
|
|
|
|
export default compose(
|
|
withRouter,
|
|
connect(mapStateToProps)
|
|
)(Settings)
|