From f3a7054f6b25a43b55bb6bda77b084171d611d12 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Wed, 30 Jan 2019 13:44:30 -0330
Subject: Add announcement for users migrated to the new UI

---
 ui/app/components/index.scss                       |  2 ++
 ui/app/components/modals/modal.js                  | 14 ---------
 ui/app/components/modals/welcome-beta/index.js     |  1 -
 .../modals/welcome-beta/welcome-beta.component.js  | 30 --------------------
 .../modals/welcome-beta/welcome-beta.container.js  |  4 ---
 .../components/ui-migration-annoucement/index.js   |  1 +
 .../components/ui-migration-annoucement/index.scss | 22 +++++++++++++++
 .../ui-migration-annoucement.component.js          | 33 ++++++++++++++++++++++
 .../ui-migration-announcement.container.js         | 21 ++++++++++++++
 9 files changed, 79 insertions(+), 49 deletions(-)
 delete mode 100644 ui/app/components/modals/welcome-beta/index.js
 delete mode 100644 ui/app/components/modals/welcome-beta/welcome-beta.component.js
 delete mode 100644 ui/app/components/modals/welcome-beta/welcome-beta.container.js
 create mode 100644 ui/app/components/ui-migration-annoucement/index.js
 create mode 100644 ui/app/components/ui-migration-annoucement/index.scss
 create mode 100644 ui/app/components/ui-migration-annoucement/ui-migration-annoucement.component.js
 create mode 100644 ui/app/components/ui-migration-annoucement/ui-migration-announcement.container.js

(limited to 'ui/app/components')

diff --git a/ui/app/components/index.scss b/ui/app/components/index.scss
index 33bbb4573..96cc74c79 100644
--- a/ui/app/components/index.scss
+++ b/ui/app/components/index.scss
@@ -77,3 +77,5 @@
 @import './gas-customization/index';
 
 @import './gas-customization/gas-price-button-group/index';
+
+@import './ui-migration-annoucement/index';
diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js
index 990be260c..32c860a7b 100644
--- a/ui/app/components/modals/modal.js
+++ b/ui/app/components/modals/modal.js
@@ -25,7 +25,6 @@ import ConfirmRemoveAccount from './confirm-remove-account'
 import ConfirmResetAccount from './confirm-reset-account'
 import TransactionConfirmed from './transaction-confirmed'
 import CancelTransaction from './cancel-transaction'
-import WelcomeBeta from './welcome-beta'
 import RejectTransactions from './reject-transactions'
 import ClearApprovedOrigins from './clear-approved-origins'
 import ConfirmCustomizeGasModal from '../gas-customization/gas-modal-page-container'
@@ -201,19 +200,6 @@ const MODALS = {
     },
   },
 
-  BETA_UI_NOTIFICATION_MODAL: {
-    contents: h(WelcomeBeta),
-    mobileModalStyle: {
-      ...modalContainerMobileStyle,
-    },
-    laptopModalStyle: {
-      ...modalContainerLaptopStyle,
-    },
-    contentStyle: {
-      borderRadius: '8px',
-    },
-  },
-
   CLEAR_APPROVED_ORIGINS: {
     contents: h(ClearApprovedOrigins),
     mobileModalStyle: {
diff --git a/ui/app/components/modals/welcome-beta/index.js b/ui/app/components/modals/welcome-beta/index.js
deleted file mode 100644
index 49e45b9d7..000000000
--- a/ui/app/components/modals/welcome-beta/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './welcome-beta.container'
diff --git a/ui/app/components/modals/welcome-beta/welcome-beta.component.js b/ui/app/components/modals/welcome-beta/welcome-beta.component.js
deleted file mode 100644
index ef1799164..000000000
--- a/ui/app/components/modals/welcome-beta/welcome-beta.component.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import Modal, { ModalContent } from '../../modal'
-
-const TransactionConfirmed = (props, context) => {
-  const { t } = context
-  const { hideModal } = props
-
-  return (
-    <Modal
-      onSubmit={() => hideModal()}
-      submitText={t('ok')}
-    >
-      <ModalContent
-        title={t('uiWelcome')}
-        description={t('uiWelcomeMessage')}
-      />
-    </Modal>
-  )
-}
-
-TransactionConfirmed.contextTypes = {
-  t: PropTypes.func,
-}
-
-TransactionConfirmed.propTypes = {
-  hideModal: PropTypes.func,
-}
-
-export default TransactionConfirmed
diff --git a/ui/app/components/modals/welcome-beta/welcome-beta.container.js b/ui/app/components/modals/welcome-beta/welcome-beta.container.js
deleted file mode 100644
index c5123ad47..000000000
--- a/ui/app/components/modals/welcome-beta/welcome-beta.container.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import WelcomeBeta from './welcome-beta.component'
-import withModalProps from '../../../higher-order-components/with-modal-props'
-
-export default withModalProps(WelcomeBeta)
diff --git a/ui/app/components/ui-migration-annoucement/index.js b/ui/app/components/ui-migration-annoucement/index.js
new file mode 100644
index 000000000..c6c8cc619
--- /dev/null
+++ b/ui/app/components/ui-migration-annoucement/index.js
@@ -0,0 +1 @@
+export {default} from './ui-migration-announcement.container'
diff --git a/ui/app/components/ui-migration-annoucement/index.scss b/ui/app/components/ui-migration-annoucement/index.scss
new file mode 100644
index 000000000..6138a3079
--- /dev/null
+++ b/ui/app/components/ui-migration-annoucement/index.scss
@@ -0,0 +1,22 @@
+.ui-migration-announcement {
+  position: absolute;
+  z-index: 9999;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: $white;
+
+  p {
+    box-sizing: border-box;
+    padding: 1em;
+    font-size: 12pt;
+  }
+
+  p:last-of-type {
+    cursor: pointer;
+    text-decoration: underline;
+    font-weight: bold;
+  }
+}
diff --git a/ui/app/components/ui-migration-annoucement/ui-migration-annoucement.component.js b/ui/app/components/ui-migration-annoucement/ui-migration-annoucement.component.js
new file mode 100644
index 000000000..7a4124972
--- /dev/null
+++ b/ui/app/components/ui-migration-annoucement/ui-migration-annoucement.component.js
@@ -0,0 +1,33 @@
+import PropTypes from 'prop-types'
+import React, {PureComponent} from 'react'
+
+export default class UiMigrationAnnouncement extends PureComponent {
+  static contextTypes = {
+    t: PropTypes.func.isRequired,
+  }
+
+  static defaultProps = {
+    shouldShowAnnouncement: true,
+  };
+
+  static propTypes = {
+    onClose: PropTypes.func.isRequired,
+    shouldShowAnnouncement: PropTypes.bool,
+  }
+
+  render () {
+    const { t } = this.context
+    const { onClose, shouldShowAnnouncement } = this.props
+
+    if (!shouldShowAnnouncement) {
+      return null
+    }
+
+    return (
+      <div className="ui-migration-announcement">
+        <p>{t('uiMigrationAnnouncement')}</p>
+        <p onClick={onClose}>{t('close')}</p>
+      </div>
+    )
+  }
+}
diff --git a/ui/app/components/ui-migration-annoucement/ui-migration-announcement.container.js b/ui/app/components/ui-migration-annoucement/ui-migration-announcement.container.js
new file mode 100644
index 000000000..6dc993b87
--- /dev/null
+++ b/ui/app/components/ui-migration-annoucement/ui-migration-announcement.container.js
@@ -0,0 +1,21 @@
+import { connect } from 'react-redux'
+import UiMigrationAnnouncement from './ui-migration-annoucement.component'
+import { setCompletedUiMigration } from '../../actions'
+
+const mapStateToProps = (state) => {
+  const shouldShowAnnouncement = !state.metamask.completedUiMigration
+
+  return {
+    shouldShowAnnouncement,
+  }
+}
+
+const mapDispatchToProps = dispatch => {
+  return {
+    onClose () {
+      dispatch(setCompletedUiMigration())
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(UiMigrationAnnouncement)
-- 
cgit