Merge pull request #3239 from MetaMask/uat-next

Uat next

2 files changed, 72 insertions, 5 deletions

diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index 6eb1e487f..61f6223bc 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -456,11 +456,31 @@ App.prototype.renderPrimary = function () {
   // notices
   if (!props.noActiveNotices) {
     log.debug('rendering notice screen for unread notices.')
-    return h(NoticeScreen, {
-      notice: props.lastUnreadNotice,
-      key: 'NoticeScreen',
-      onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)),
-    })
+    return h('div', [
+
+      h(NoticeScreen, {
+        notice: props.lastUnreadNotice,
+        key: 'NoticeScreen',
+        onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)),
+      }),
+
+      !props.isInitialized && h('.flex-row.flex-center.flex-grow', [
+        h('p.pointer', {
+          onClick: () => {
+            global.platform.openExtensionInBrowser()
+            props.dispatch(actions.setFeatureFlag('betaUI', true, 'BETA_UI_NOTIFICATION_MODAL'))
+              .then(() => props.dispatch(actions.setNetworkEndpoints(BETA_UI_NETWORK_TYPE)))
+          },
+          style: {
+            fontSize: '0.8em',
+            color: '#aeaeae',
+            textDecoration: 'underline',
+            marginTop: '32px',
+          },
+        }, 'Try Beta Version'),
+      ]),
+
+    ])
   } else if (props.lostAccounts && props.lostAccounts.length > 0) {
     log.debug('rendering notice screen for lost accounts view.')
     return h(NoticeScreen, {
diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css
index 3bb64647a..cdb4cc439 100644
--- a/old-ui/app/css/index.css
+++ b/old-ui/app/css/index.css
@@ -761,4 +761,51 @@ div.message-container > div:first-child {
   right: 17.5px;
   font-family: sans-serif;
   cursor: pointer;
+}
+
+.notification-modal__wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  position: relative;
+  border: 1px solid #dedede;
+  box-shadow: 0 0 2px 2px #dedede;
+  font-family: Roboto;
+}
+
+.notification-modal__header {
+  background: #f6f6f6;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  padding: 30px;
+  font-size: 22px;
+  color: #1b344d;
+  height: 79px;
+}
+
+.notification-modal__message {
+  padding: 20px;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  font-size: 17px;
+  color: #1b344d;
+}
+
+.notification-modal__buttons {
+  display: flex;
+  justify-content: space-evenly;
+  width: 100%;
+  margin-bottom: 24px;
+  padding: 0px 42px;
+}
+
+.notification-modal__buttons__btn {
+  cursor: pointer;
+}
+
+.notification-modal__link {
+  color: #2f9ae0;
 }
\ No newline at end of file