From cebcbab10ebd8cc65b7b9069a6add77bd72f3808 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Fri, 20 Nov 2020 11:47:52 +0100
Subject: [PATCH] fix: make beta warning less alarming
---
app/assets/javascripts/views/footer/footer-view.pug | 6 ++----
app/assets/javascripts/views/footer/footer_view.ts | 12 +++++++++++-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/views/footer/footer-view.pug b/app/assets/javascripts/views/footer/footer-view.pug
index bb3dabf0a..2eb196935 100644
--- a/app/assets/javascripts/views/footer/footer-view.pug
+++ b/app/assets/javascripts/views/footer/footer-view.pug
@@ -37,10 +37,8 @@
)
.sk-app-bar-item.border(ng-if="ctrl.state.showBetaWarning")
.sk-app-bar-item(ng-if="ctrl.state.showBetaWarning")
- a.no-decoration.sk-label.title.uppercase(
- href='https://github.com/standardnotes/forum/issues/1114',
- rel='noopener',
- target='_blank'
+ a.no-decoration.sk-label.title(
+ ng-click="ctrl.displayBetaDialog()"
) You are using a beta version of the app
.center
.sk-app-bar-item(ng-if='ctrl.arbitraryStatusMessage')
diff --git a/app/assets/javascripts/views/footer/footer_view.ts b/app/assets/javascripts/views/footer/footer_view.ts
index cf0f53564..0797ae601 100644
--- a/app/assets/javascripts/views/footer/footer_view.ts
+++ b/app/assets/javascripts/views/footer/footer_view.ts
@@ -23,7 +23,7 @@ import {
STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON,
} from '@/strings';
import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
-import { confirmDialog } from '@/services/alertService';
+import { alertDialog, confirmDialog } from '@/services/alertService';
import { autorun, IReactionDisposer } from 'mobx';
/**
@@ -568,6 +568,16 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
}
}
+ displayBetaDialog() {
+ alertDialog({
+ title: 'You are using a beta version of the app',
+ text:
+ 'If you wish to go back to a stable version, make sure to sign out ' +
+ 'before installing it.
You can silence this warning in the ' +
+ 'Account menu.'
+ });
+ }
+
clickOutsideAccountMenu() {
if (this.application && this.application.authenticationInProgress()) {
return;