Merge remote-tracking branch 'upstream/develop' into HEAD

14 files changed, 58 insertions, 46 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8de3aa8de..a9a8e96c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@
 - [#6914](https://github.com/MetaMask/metamask-extension/pull/6914): Adds Address Book feature
 - [#6928](https://github.com/MetaMask/metamask-extension/pull/6928): Disable Copy Tx ID and block explorer link for transactions without hash
 
+## 6.7.3 Thu Jul 18 2019
+
+- [#6888](https://github.com/MetaMask/metamask-extension/pull/6888): Fix bug with resubmitting unsigned transactions.
+
 ## 6.7.2 Mon Jul 01 2019
 
 - [#6713](https://github.com/MetaMask/metamask-extension/pull/6713): * Normalize and Validate txParams in TransactionStateManager.addTx too
diff --git a/app/manifest.json b/app/manifest.json
index d14149d81..17c12493f 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "6.7.2",
+  "version": "6.7.3",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
diff --git a/development/states/send-edit.json b/development/states/send-edit.json
index 3775515a3..1b33e6edc 100644
--- a/development/states/send-edit.json
+++ b/development/states/send-edit.json
@@ -182,7 +182,9 @@
     "warnings": {}
   },
   "confirmTransaction": {
-    "txData": {},
+    "txData": {
+      "id": 4768706228115573
+    },
     "tokenData": {},
     "methodData": {},
     "tokenProps": {
diff --git a/test/e2e/incremental-security.spec.js b/test/e2e/incremental-security.spec.js
index 5b0990581..ecd6f5999 100644
--- a/test/e2e/incremental-security.spec.js
+++ b/test/e2e/incremental-security.spec.js
@@ -280,6 +280,12 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
     })
 
+    it('can click through the success screen', async () => {
+      const confirm = await findElement(driver, By.xpath(`//button[contains(text(), 'All Done')]`))
+      await confirm.click()
+      await delay(regularDelayMs)
+    })
+
     it('should have the correct amount of eth', async () => {
       const balances = await findElements(driver, By.css('.currency-display-component__text'))
       await driver.wait(until.elementTextMatches(balances[0], /1/), 15000)
diff --git a/ui/app/components/app/multiple-notifications/multiple-notifications.component.js b/ui/app/components/app/multiple-notifications/multiple-notifications.component.js
index 95dbb5c9a..09020c467 100644
--- a/ui/app/components/app/multiple-notifications/multiple-notifications.component.js
+++ b/ui/app/components/app/multiple-notifications/multiple-notifications.component.js
@@ -16,21 +16,20 @@ export default class MultipleNotifications extends PureComponent {
     const { showAll } = this.state
     const { notifications, classNames = [] } = this.props
 
+    const notificationsToBeRendered = notifications.filter(notificationConfig => notificationConfig.shouldBeRendered)
+
     return (<div
       className={classnames(...classNames, {
         'home-notification-wrapper--show-all': showAll,
         'home-notification-wrapper--show-first': !showAll,
       })}
     >
-      {notifications
-        .filter(notificationConfig => notificationConfig.shouldBeRendered)
-        .map(notificationConfig => notificationConfig.component)
-      }
+      { notificationsToBeRendered.map(notificationConfig => notificationConfig.component) }
       <div
         className="home-notification-wrapper__i-container"
         onClick={() => this.setState({ showAll: !showAll })}
       >
-        {notifications.length > 1 ? <i className={classnames('fa fa-sm fa-sort-amount-asc', {
+        {notificationsToBeRendered.length > 1 ? <i className={classnames('fa fa-sm fa-sort-amount-asc', {
           'flipped': !showAll,
         })} /> : null}
       </div>
diff --git a/ui/app/ducks/app/app.js b/ui/app/ducks/app/app.js
index 6fe2a3a9a..029c755cd 100644
--- a/ui/app/ducks/app/app.js
+++ b/ui/app/ducks/app/app.js
@@ -73,7 +73,6 @@ function reduceApp (state, action) {
     networksTabSelectedRpcUrl: '',
     networksTabIsInAddMode: false,
     loadingMethodData: false,
-    showingSeedPhraseBackupAfterOnboarding: false,
   }, state.appState)
 
   switch (action.type) {
@@ -757,17 +756,6 @@ function reduceApp (state, action) {
         loadingMethodData: false,
       })
 
-    case actions.SHOW_SEED_PHRASE_BACKUP_AFTER_ONBOARDING:
-      return extend(appState, {
-        showingSeedPhraseBackupAfterOnboarding: true,
-      })
-
-    case actions.HIDE_SEED_PHRASE_BACKUP_AFTER_ONBOARDING:
-      return extend(appState, {
-        showingSeedPhraseBackupAfterOnboarding: false,
-      })
-
-
     default:
       return appState
   }
diff --git a/ui/app/helpers/constants/routes.js b/ui/app/helpers/constants/routes.js
index adcd3f14d..cd26b3628 100644
--- a/ui/app/helpers/constants/routes.js
+++ b/ui/app/helpers/constants/routes.js
@@ -32,6 +32,7 @@ const INITIALIZE_CREATE_PASSWORD_ROUTE = '/initialize/create-password'
 const INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE = '/initialize/create-password/import-with-seed-phrase'
 const INITIALIZE_SELECT_ACTION_ROUTE = '/initialize/select-action'
 const INITIALIZE_SEED_PHRASE_ROUTE = '/initialize/seed-phrase'
+const INITIALIZE_BACKUP_SEED_PHRASE_ROUTE = '/initialize/backup-seed-phrase'
 const INITIALIZE_END_OF_FLOW_ROUTE = '/initialize/end-of-flow'
 const INITIALIZE_CONFIRM_SEED_PHRASE_ROUTE = '/initialize/seed-phrase/confirm'
 const INITIALIZE_METAMETRICS_OPT_IN_ROUTE = '/initialize/metametrics-opt-in'
@@ -90,4 +91,6 @@ module.exports = {
   CONTACT_MY_ACCOUNTS_VIEW_ROUTE,
   CONTACT_MY_ACCOUNTS_EDIT_ROUTE,
   NETWORKS_ROUTE,
+  INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
 }
+
diff --git a/ui/app/pages/first-time-flow/first-time-flow.component.js b/ui/app/pages/first-time-flow/first-time-flow.component.js
index df9631e15..91415d2ee 100644
--- a/ui/app/pages/first-time-flow/first-time-flow.component.js
+++ b/ui/app/pages/first-time-flow/first-time-flow.component.js
@@ -18,6 +18,7 @@ import {
   INITIALIZE_SELECT_ACTION_ROUTE,
   INITIALIZE_END_OF_FLOW_ROUTE,
   INITIALIZE_METAMETRICS_OPT_IN_ROUTE,
+  INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
 } from '../../helpers/constants/routes'
 
 export default class FirstTimeFlow extends PureComponent {
@@ -114,6 +115,16 @@ export default class FirstTimeFlow extends PureComponent {
             )}
           />
           <Route
+            path={INITIALIZE_BACKUP_SEED_PHRASE_ROUTE}
+            render={props => (
+              <SeedPhrase
+                { ...props }
+                seedPhrase={seedPhrase}
+                verifySeedPhrase={verifySeedPhrase}
+              />
+            )}
+          />
+          <Route
             path={INITIALIZE_CREATE_PASSWORD_ROUTE}
             render={props => (
               <CreatePassword
diff --git a/ui/app/pages/first-time-flow/first-time-flow.container.js b/ui/app/pages/first-time-flow/first-time-flow.container.js
index 76fd12bcd..ec9920d74 100644
--- a/ui/app/pages/first-time-flow/first-time-flow.container.js
+++ b/ui/app/pages/first-time-flow/first-time-flow.container.js
@@ -7,9 +7,13 @@ import {
   unlockAndGetSeedPhrase,
   verifySeedPhrase,
 } from '../../store/actions'
+import {
+  INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
+} from '../../helpers/constants/routes'
 
-const mapStateToProps = state => {
-  const { metamask: { completedOnboarding, isInitialized, isUnlocked, seedPhraseBackedUp }, appState: { showingSeedPhraseBackupAfterOnboarding } } = state
+const mapStateToProps = (state, ownProps) => {
+  const { metamask: { completedOnboarding, isInitialized, isUnlocked, seedPhraseBackedUp } } = state
+  const showingSeedPhraseBackupAfterOnboarding = Boolean(ownProps.location.pathname.match(INITIALIZE_BACKUP_SEED_PHRASE_ROUTE))
 
   return {
     completedOnboarding,
diff --git a/ui/app/pages/first-time-flow/seed-phrase/seed-phrase.component.js b/ui/app/pages/first-time-flow/seed-phrase/seed-phrase.component.js
index 79cb27c52..ae38757d9 100644
--- a/ui/app/pages/first-time-flow/seed-phrase/seed-phrase.component.js
+++ b/ui/app/pages/first-time-flow/seed-phrase/seed-phrase.component.js
@@ -6,6 +6,7 @@ import ConfirmSeedPhrase from './confirm-seed-phrase'
 import {
   INITIALIZE_SEED_PHRASE_ROUTE,
   INITIALIZE_CONFIRM_SEED_PHRASE_ROUTE,
+  INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
   DEFAULT_ROUTE,
 } from '../../../helpers/constants/routes'
 import HTML5Backend from 'react-dnd-html5-backend'
@@ -68,6 +69,16 @@ export default class SeedPhrase extends PureComponent {
                 />
               )}
             />
+            <Route
+              exact
+              path={INITIALIZE_BACKUP_SEED_PHRASE_ROUTE}
+              render={props => (
+                <RevealSeedPhrase
+                  { ...props }
+                  seedPhrase={seedPhrase || verifiedSeedPhrase}
+                />
+              )}
+            />
           </Switch>
         </div>
       </DragDropContextProvider>
diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js
index dca4c8540..66d962ff1 100644
--- a/ui/app/pages/home/home.component.js
+++ b/ui/app/pages/home/home.component.js
@@ -12,7 +12,7 @@ import {
   RESTORE_VAULT_ROUTE,
   CONFIRM_TRANSACTION_ROUTE,
   CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
-  INITIALIZE_SEED_PHRASE_ROUTE,
+  INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
 } from '../../helpers/constants/routes'
 
 export default class Home extends PureComponent {
@@ -43,8 +43,8 @@ export default class Home extends PureComponent {
     viewingUnconnectedDapp: PropTypes.bool.isRequired,
     forceApproveProviderRequestByOrigin: PropTypes.func,
     shouldShowSeedPhraseReminder: PropTypes.bool,
-    showSeedPhraseBackupAfterOnboarding: PropTypes.bool,
     rejectProviderRequestByOrigin: PropTypes.func,
+    isPopup: PropTypes.bool,
   }
 
   componentWillMount () {
@@ -82,8 +82,8 @@ export default class Home extends PureComponent {
       viewingUnconnectedDapp,
       forceApproveProviderRequestByOrigin,
       shouldShowSeedPhraseReminder,
-      showSeedPhraseBackupAfterOnboarding,
       rejectProviderRequestByOrigin,
+      isPopup,
     } = this.props
 
     if (forgottenPassword) {
@@ -140,8 +140,11 @@ export default class Home extends PureComponent {
                         descriptionText={t('backupApprovalNotice')}
                         acceptText={t('backupNow')}
                         onAccept={() => {
-                          showSeedPhraseBackupAfterOnboarding()
-                          history.push(INITIALIZE_SEED_PHRASE_ROUTE)
+                          if (isPopup) {
+                            global.platform.openExtensionInBrowser(INITIALIZE_BACKUP_SEED_PHRASE_ROUTE)
+                          } else {
+                            history.push(INITIALIZE_BACKUP_SEED_PHRASE_ROUTE)
+                          }
                         }}
                         infoText={t('backupApprovalInfo')}
                         key="home-backupApprovalNotice"
diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index 434d4b7e3..f03ffdc02 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -7,7 +7,6 @@ import { getCurrentEthBalance } from '../../selectors/selectors'
 import {
   forceApproveProviderRequestByOrigin,
   unsetMigratedPrivacyMode,
-  showSeedPhraseBackupAfterOnboarding,
   rejectProviderRequestByOrigin,
 } from '../../store/actions'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
@@ -60,7 +59,6 @@ const mapDispatchToProps = (dispatch) => ({
   unsetMigratedPrivacyMode: () => dispatch(unsetMigratedPrivacyMode()),
   forceApproveProviderRequestByOrigin: (origin) => dispatch(forceApproveProviderRequestByOrigin(origin)),
   rejectProviderRequestByOrigin: origin => dispatch(rejectProviderRequestByOrigin(origin)),
-  showSeedPhraseBackupAfterOnboarding: () => dispatch(showSeedPhraseBackupAfterOnboarding()),
 })
 
 export default compose(
diff --git a/ui/app/pages/send/send-content/send-content.component.js b/ui/app/pages/send/send-content/send-content.component.js
index c08a018da..aff675e7a 100644
--- a/ui/app/pages/send/send-content/send-content.component.js
+++ b/ui/app/pages/send/send-content/send-content.component.js
@@ -48,7 +48,7 @@ export default class SendContent extends Component {
   maybeRenderAddContact () {
     const { t } = this.context
     const { to, addressBook = [], ownedAccounts = [], showAddToAddressBookModal } = this.props
-    const isOwnedAccount = !!ownedAccounts.find(({ address }) => address === to)
+    const isOwnedAccount = !!ownedAccounts.find(({ address }) => address.toLowerCase() === to.toLowerCase())
     const contact = addressBook.find(({ address }) => address === to) || {}
 
     if (isOwnedAccount || contact.name) {
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index 9d8c7c6b2..adb5fe450 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -377,11 +377,6 @@ var actions = {
   LOADING_TOKEN_PARAMS_FINISHED: 'LOADING_TOKEN_PARAMS_FINISHED',
 
   setSeedPhraseBackedUp,
-  showSeedPhraseBackupAfterOnboarding,
-  SHOW_SEED_PHRASE_BACKUP_AFTER_ONBOARDING: 'SHOW_SEED_PHRASE_BACKUP_AFTER_ONBOARDING',
-  hideSeedPhraseBackupAfterOnboarding,
-  HIDE_SEED_PHRASE_BACKUP_AFTER_ONBOARDING: 'HIDE_SEED_PHRASE_BACKUP_AFTER_ONBOARDING',
-
   verifySeedPhrase,
   SET_SEED_PHRASE_BACKED_UP_TO_TRUE: 'SET_SEED_PHRASE_BACKED_UP_TO_TRUE',
 }
@@ -2796,15 +2791,3 @@ function setSeedPhraseBackedUp (seedPhraseBackupState) {
     })
   }
 }
-
-function showSeedPhraseBackupAfterOnboarding () {
-  return {
-    type: actions.SHOW_SEED_PHRASE_BACKUP_AFTER_ONBOARDING,
-  }
-}
-
-function hideSeedPhraseBackupAfterOnboarding () {
-  return {
-    type: actions.HIDE_SEED_PHRASE_BACKUP_AFTER_ONBOARDING,
-  }
-}