- {t('myWalletAccounts')}
+
+ if (addressBook.length) {
+ return (
+
-
- {t('myWalletAccountsDescription')}
-
-
+ );
+ }
+ return (
+
+
+
+
{t('builContactList')}
+
+ {t('addFriendsAndAddresses')}
+
+
);
@@ -120,33 +97,19 @@ export default class ContactListTab extends Component {
}
renderAddressBookContent() {
- const { hideAddressBook, showingMyAccounts } = this.props;
+ const { hideAddressBook } = this.props;
- if (!hideAddressBook && !showingMyAccounts) {
- return (
-
- {this.renderMyAccountsButton()}
- {this.renderAddresses()}
-
- );
- } else if (!hideAddressBook && showingMyAccounts) {
- return
;
+ if (!hideAddressBook) {
+ return
{this.renderAddresses()}
;
}
return null;
}
render() {
- const { addingContact } = this.props;
-
return (
{this.renderAddressBookContent()}
{this.renderContactContent()}
- {!addingContact && (
-
- {this.renderAddButton()}
-
- )}
);
}
diff --git a/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js b/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js
index 19749eafd..0d80480b5 100644
--- a/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js
+++ b/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js
@@ -9,9 +9,6 @@ import {
CONTACT_ADD_ROUTE,
CONTACT_EDIT_ROUTE,
CONTACT_VIEW_ROUTE,
- CONTACT_MY_ACCOUNTS_ROUTE,
- CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
- CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
} from '../../../helpers/constants/routes';
import ContactListTab from './contact-list-tab.component';
@@ -22,20 +19,9 @@ const mapStateToProps = (state, ownProps) => {
const pathNameTail = pathname.match(/[^/]+$/u)[0];
const pathNameTailIsAddress = pathNameTail.includes('0x');
- const viewingContact = Boolean(
- pathname.match(CONTACT_VIEW_ROUTE) ||
- pathname.match(CONTACT_MY_ACCOUNTS_VIEW_ROUTE),
- );
- const editingContact = Boolean(
- pathname.match(CONTACT_EDIT_ROUTE) ||
- pathname.match(CONTACT_MY_ACCOUNTS_EDIT_ROUTE),
- );
+ const viewingContact = Boolean(pathname.match(CONTACT_VIEW_ROUTE));
+ const editingContact = Boolean(pathname.match(CONTACT_EDIT_ROUTE));
const addingContact = Boolean(pathname.match(CONTACT_ADD_ROUTE));
- const showingMyAccounts = Boolean(
- pathname.match(CONTACT_MY_ACCOUNTS_ROUTE) ||
- pathname.match(CONTACT_MY_ACCOUNTS_VIEW_ROUTE) ||
- pathname.match(CONTACT_MY_ACCOUNTS_EDIT_ROUTE),
- );
const envIsPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
const hideAddressBook =
@@ -45,7 +31,6 @@ const mapStateToProps = (state, ownProps) => {
viewingContact,
editingContact,
addingContact,
- showingMyAccounts,
addressBook: getAddressBook(state),
selectedAddress: pathNameTailIsAddress ? pathNameTail : '',
hideAddressBook,
diff --git a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
index e705dd7fb..0ccc1f64a 100644
--- a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
+++ b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
@@ -68,6 +68,7 @@ export default class EditContact extends PureComponent {
className="settings-page__address-book-button"
onClick={async () => {
await removeFromAddressBook(chainId, address);
+ history.push(listRoute);
}}
>
{t('deleteAccount')}
diff --git a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js
index dfb23aabd..205ec7ed5 100644
--- a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js
+++ b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js
@@ -4,9 +4,6 @@ import { withRouter } from 'react-router-dom';
import { getAddressBookEntry } from '../../../../selectors';
import {
CONTACT_VIEW_ROUTE,
- CONTACT_MY_ACCOUNTS_ROUTE,
- CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
- CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
CONTACT_LIST_ROUTE,
} from '../../../../helpers/constants/routes';
import {
@@ -31,22 +28,13 @@ const mapStateToProps = (state, ownProps) => {
const { chainId } = state.metamask.provider;
- const showingMyAccounts = Boolean(
- pathname.match(CONTACT_MY_ACCOUNTS_EDIT_ROUTE),
- );
-
return {
address: contact ? address : null,
chainId,
name,
memo,
- viewRoute: showingMyAccounts
- ? CONTACT_MY_ACCOUNTS_VIEW_ROUTE
- : CONTACT_VIEW_ROUTE,
- listRoute: showingMyAccounts
- ? CONTACT_MY_ACCOUNTS_ROUTE
- : CONTACT_LIST_ROUTE,
- showingMyAccounts,
+ viewRoute: CONTACT_VIEW_ROUTE,
+ listRoute: CONTACT_LIST_ROUTE,
};
};
diff --git a/ui/app/pages/settings/contact-list-tab/index.scss b/ui/app/pages/settings/contact-list-tab/index.scss
index aef7c208c..7d1d26606 100644
--- a/ui/app/pages/settings/contact-list-tab/index.scss
+++ b/ui/app/pages/settings/contact-list-tab/index.scss
@@ -5,12 +5,15 @@
}
.address-book {
- flex: 0.4 1 40%;
- max-width: 40%;
+ flex: 0.4 1 100%;
@media screen and (max-width: 576px) {
flex: 1;
max-width: 100%;
+
+ &__container {
+ min-height: 100%;
+ }
}
&__entry {
@@ -51,6 +54,32 @@
}
}
+ &__container {
+ margin: 0 auto;
+ min-height: 70%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ }
+
+ &__title {
+ @include H4;
+
+ font-weight: 600;
+ margin-bottom: 0.5em;
+ }
+
+ &__sub-title {
+ font-size: small;
+ margin-bottom: 0.5em;
+ }
+
+ &__link {
+ background-color: #fff;
+ color: #037dd6;
+ }
+
&__input {
@include H4;
@@ -247,7 +276,7 @@
}
.address-book-contact-content {
- flex: 0.4 1 40%;
+ flex: 0.4 1 100%;
@media screen and (max-width: 576px) {
flex: 1;
diff --git a/ui/app/pages/settings/contact-list-tab/my-accounts/index.js b/ui/app/pages/settings/contact-list-tab/my-accounts/index.js
deleted file mode 100644
index e5bde6530..000000000
--- a/ui/app/pages/settings/contact-list-tab/my-accounts/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './my-accounts.container';
diff --git a/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.component.js b/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.component.js
deleted file mode 100644
index bb7702c56..000000000
--- a/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.component.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import ContactList from '../../../../components/app/contact-list';
-import { CONTACT_MY_ACCOUNTS_VIEW_ROUTE } from '../../../../helpers/constants/routes';
-
-export default class ViewContact extends PureComponent {
- static contextTypes = {
- t: PropTypes.func,
- };
-
- static propTypes = {
- myAccounts: PropTypes.array,
- history: PropTypes.object,
- };
-
- renderMyAccounts() {
- const { myAccounts, history } = this.props;
-
- return (
-
- myAccounts}
- selectRecipient={(address) => {
- history.push(`${CONTACT_MY_ACCOUNTS_VIEW_ROUTE}/${address}`);
- }}
- />
-
- );
- }
-
- render() {
- return
{this.renderMyAccounts()}
;
- }
-}
diff --git a/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js b/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js
deleted file mode 100644
index 82ac4b4ef..000000000
--- a/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { compose } from 'redux';
-import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
-import { accountsWithSendEtherInfoSelector } from '../../../../selectors';
-import ViewContact from './my-accounts.component';
-
-const mapStateToProps = (state) => {
- const myAccounts = accountsWithSendEtherInfoSelector(state);
-
- return {
- myAccounts,
- };
-};
-
-export default compose(withRouter, connect(mapStateToProps))(ViewContact);
diff --git a/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js b/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js
index 8fe58a5b4..06a753446 100644
--- a/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js
+++ b/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js
@@ -6,9 +6,6 @@ import { checksumAddress } from '../../../../helpers/utils/util';
import {
CONTACT_EDIT_ROUTE,
CONTACT_LIST_ROUTE,
- CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
- CONTACT_MY_ACCOUNTS_ROUTE,
- CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
} from '../../../../helpers/constants/routes';
import ViewContact from './view-contact.component';
@@ -25,21 +22,13 @@ const mapStateToProps = (state, ownProps) => {
getAddressBookEntry(state, address) || state.metamask.identities[address];
const { memo, name } = contact || {};
- const showingMyAccounts = Boolean(
- pathname.match(CONTACT_MY_ACCOUNTS_VIEW_ROUTE),
- );
-
return {
name,
address: contact ? address : null,
checkSummedAddress: checksumAddress(address),
memo,
- editRoute: showingMyAccounts
- ? CONTACT_MY_ACCOUNTS_EDIT_ROUTE
- : CONTACT_EDIT_ROUTE,
- listRoute: showingMyAccounts
- ? CONTACT_MY_ACCOUNTS_ROUTE
- : CONTACT_LIST_ROUTE,
+ editRoute: CONTACT_EDIT_ROUTE,
+ listRoute: CONTACT_LIST_ROUTE,
};
};
diff --git a/ui/app/pages/settings/settings.component.js b/ui/app/pages/settings/settings.component.js
index 2b02eccfd..2ef3f15d3 100644
--- a/ui/app/pages/settings/settings.component.js
+++ b/ui/app/pages/settings/settings.component.js
@@ -15,9 +15,6 @@ import {
CONTACT_ADD_ROUTE,
CONTACT_EDIT_ROUTE,
CONTACT_VIEW_ROUTE,
- CONTACT_MY_ACCOUNTS_ROUTE,
- CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
- CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
} from '../../helpers/constants/routes';
import SettingsTab from './settings-tab';
import AlertsTab from './alerts-tab';
@@ -222,11 +219,6 @@ class SettingsPage extends PureComponent {
-
-
-
);
diff --git a/ui/app/pages/settings/settings.container.js b/ui/app/pages/settings/settings.container.js
index ed664bc2f..57fedadd2 100644
--- a/ui/app/pages/settings/settings.container.js
+++ b/ui/app/pages/settings/settings.container.js
@@ -14,9 +14,6 @@ import {
CONTACT_LIST_ROUTE,
CONTACT_ADD_ROUTE,
CONTACT_EDIT_ROUTE,
- CONTACT_MY_ACCOUNTS_ROUTE,
- CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
- CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
CONTACT_VIEW_ROUTE,
GENERAL_ROUTE,
NETWORKS_FORM_ROUTE,
@@ -34,7 +31,6 @@ const ROUTES_TO_I18N_KEYS = {
[CONTACT_ADD_ROUTE]: 'newContact',
[CONTACT_EDIT_ROUTE]: 'editContact',
[CONTACT_LIST_ROUTE]: 'contacts',
- [CONTACT_MY_ACCOUNTS_ROUTE]: 'myAccounts',
[CONTACT_VIEW_ROUTE]: 'viewContact',
[NETWORKS_ROUTE]: 'networks',
[NETWORKS_FORM_ROUTE]: 'networks',
@@ -47,38 +43,24 @@ const mapStateToProps = (state, ownProps) => {
const pathNameTail = pathname.match(/[^/]+$/u)[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 isNetworksFormPage = Boolean(pathname.match(NETWORKS_FORM_ROUTE));
const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname];
let backRoute = SETTINGS_ROUTE;
- if (isMyAccountsPage && isAddressEntryPage) {
- backRoute = CONTACT_MY_ACCOUNTS_ROUTE;
- } else if (isEditContactPage) {
+ if (isEditContactPage) {
backRoute = `${CONTACT_VIEW_ROUTE}/${pathNameTail}`;
- } else if (isEditMyAccountsContactPage) {
- backRoute = `${CONTACT_MY_ACCOUNTS_VIEW_ROUTE}/${pathNameTail}`;
- } else if (isAddressEntryPage || isMyAccountsPage || isAddContactPage) {
+ } else if (isAddressEntryPage || isAddContactPage) {
backRoute = CONTACT_LIST_ROUTE;
} else if (isNetworksFormPage) {
backRoute = NETWORKS_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,
@@ -87,14 +69,12 @@ const mapStateToProps = (state, ownProps) => {
return {
isAddressEntryPage,
- isMyAccountsPage,
backRoute,
currentPath: pathname,
isPopup,
pathnameI18nKey,
addressName,
initialBreadCrumbRoute,
- breadCrumbTextKey,
initialBreadCrumbKey,
mostRecentOverviewPage: getMostRecentOverviewPage(state),
};
-