From 457a8967d658e099aa52e458fd4011d5fe890f88 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 17 Aug 2020 12:12:54 +1000 Subject: [PATCH] remove beta disclaimer entirely --- _locales/en/messages.json | 12 -------- background.html | 1 - background_test.html | 1 - js/views/beta_release_disclaimer_view.js | 38 ------------------------ js/views/inbox_view.js | 9 ------ stylesheets/_session.scss | 19 ------------ test/index.html | 1 - 7 files changed, 81 deletions(-) delete mode 100644 js/views/beta_release_disclaimer_view.js diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 7cb92a5f4..6615b9be0 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1027,18 +1027,6 @@ "message": "Secure session reset succeeded", "description": "This is a past tense, informational message. In other words, your secure session has been reset." }, - "betaDisclaimerTitle": { - "message": "Thanks for using Session!", - "description": "Title for beta disclaimer modal" - }, - "betaDisclaimerSubtitle": { - "message": "This software is still in its beta phase.", - "description": "Subtitle for beta disclaimer modal" - }, - "betaDisclaimerDescription": { - "message": "While your messages are secured with end-to-end encryption, third parties like your ISP can see who you're talking to while in the beta version. It is also possible that third parties could correlate your public key to your IP address and real identity if they learn your public key.", - "description": "Description for beta disclaimer modal" - }, "quoteThumbnailAlt": { "message": "Thumbnail of image from quoted message", "description": "Used in alt tag of thumbnail images inside of an embedded message quote" diff --git a/background.html b/background.html index db453bb99..589f85826 100644 --- a/background.html +++ b/background.html @@ -493,7 +493,6 @@ - diff --git a/background_test.html b/background_test.html index c6a198b6e..21a5881dd 100644 --- a/background_test.html +++ b/background_test.html @@ -493,7 +493,6 @@ - diff --git a/js/views/beta_release_disclaimer_view.js b/js/views/beta_release_disclaimer_view.js deleted file mode 100644 index 004d3582c..000000000 --- a/js/views/beta_release_disclaimer_view.js +++ /dev/null @@ -1,38 +0,0 @@ -/* global Whisper, window */ - -// eslint-disable-next-line func-names -(function() { - 'use strict'; - - window.Whisper = window.Whisper || {}; - - Whisper.BetaReleaseDisclaimer = Whisper.View.extend({ - className: 'loki-dialog beta-disclaimer-dialog modal', - initialize() { - this.close = this.close.bind(this); - this.render(); - }, - - render() { - this.dialogView = new Whisper.ReactWrapperView({ - className: 'session-beta-disclaimer', - Component: window.Signal.Components.SessionConfirm, - props: { - title: window.i18n('betaDisclaimerTitle'), - message: window.i18n('betaDisclaimerSubtitle'), - messageSub: window.i18n('betaDisclaimerDescription'), - hideCancel: true, - onClickOk: this.close, - }, - }); - - this.$el.append(this.dialogView.el); - return this; - }, - - close() { - window.storage.put('betaReleaseDisclaimerAccepted', true); - this.remove(); - }, - }); -})(); diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index a9213a7fc..489b0ef8d 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -131,11 +131,6 @@ model: { window: options.window }, }); - if (!window.storage.get('betaReleaseDisclaimerAccepted')) { - // Beta disclaimer disabled. - // this.showBetaReleaseDisclaimer(); - } - if (!options.initialLoadComplete) { this.appLoadingScreen = new Whisper.AppLoadingScreen(); this.appLoadingScreen.render(); @@ -456,10 +451,6 @@ toast.$el.appendTo(this.$('.gutter')); toast.render(); }, - showBetaReleaseDisclaimer() { - const dialog = new Whisper.BetaReleaseDisclaimer(); - this.el.append(dialog.el); - }, }); Whisper.ExpiredAlertBanner = Whisper.View.extend({ diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index c611aa0da..f46ea77fb 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -1400,25 +1400,6 @@ input { width: 20vw; } -.session-beta-disclaimer { - .session-modal { - width: 600px; - - &__header { - font-size: $session-font-lg; - } - - &__body > div:first-child { - padding: $session-margin-lg; - } - - .session-confirm-main-message { - opacity: 0.8; - margin-bottom: $session-margin-xs; - } - } -} - .session-confirm-wrapper { position: absolute; height: 100%; diff --git a/test/index.html b/test/index.html index 7e9022a49..a84932bd8 100644 --- a/test/index.html +++ b/test/index.html @@ -541,7 +541,6 @@ -