chore: merge from nightly branch into release branch in prep for next beta

2 files changed, 5 insertions, 14 deletions

diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index f7f8dc41c..cc2e81b70 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -36,15 +36,15 @@ const messages = defineMessages({
   },
   shareTextEmail: {
     id: 'feature.shareFranz.shareText.email',
-    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
+    defaultMessage: '!!! I\'ve added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
   },
   shareTextTwitter: {
     id: 'feature.shareFranz.shareText.twitter',
-    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger',
+    defaultMessage: '!!! I\'ve added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger',
   },
 });
 
-const styles = theme => ({
+const styles = (theme) => ({
   modal: {
     width: '80%',
     maxWidth: 600,
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js
index 34475f674..9add0f65e 100644
--- a/src/features/shareFranz/index.js
+++ b/src/features/shareFranz/index.js
@@ -1,8 +1,6 @@
 import { reaction } from 'mobx';
 import ms from 'ms';
 import { state as ModalState } from './store';
-import { state as delayAppState } from '../delayApp';
-import { planSelectionStore } from '../planSelection';
 
 export { default as Component } from './Component';
 
@@ -19,21 +17,14 @@ export default function initialize(stores) {
 
   function showModal() {
     debug('Would have showed share window');
-
-    // state.isModalVisible = true;
   }
 
   reaction(
     () => stores.user.isLoggedIn,
     () => {
       setTimeout(() => {
-        if (stores.settings.stats.appStarts % 50 === 0 && !planSelectionStore.showPlanSelectionOverlay) {
-          if (delayAppState.isDelayAppScreenVisible) {
-            debug('Delaying share modal by 5 minutes');
-            setTimeout(() => showModal(), ms('5m'));
-          } else {
-            showModal();
-          }
+        if (stores.settings.stats.appStarts % 50 === 0) {
+          showModal();
         }
       }, ms('2s'));
     },