From 24d0223fee38c36ec19d9c662579dba7d787f8b4 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 5 Sep 2019 09:49:25 +0200 Subject: polishing --- src/features/todos/components/TodosWebview.js | 8 ++++---- src/features/todos/store.js | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) (limited to 'src/features/todos') diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index 9a50f7e8d..fa530daed 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js @@ -9,7 +9,7 @@ import { defineMessages, intlShape } from 'react-intl'; import { mdiChevronRight, mdiCheckAll } from '@mdi/js'; import * as environment from '../../../environment'; import Appear from '../../../components/ui/effects/Appear'; -import ActivateTrialButton from '../../../components/ui/ActivateTrialButton'; +import UpgradeButton from '../../../components/ui/UpgradeButton'; const OPEN_TODOS_BUTTON_SIZE = 45; const CLOSE_TODOS_BUTTON_SIZE = 35; @@ -116,7 +116,7 @@ const styles = theme => ({ alignItems: 'center', width: '80%', maxWidth: 300, - margin: [-50, 'auto', 0], + margin: [0, 'auto'], textAlign: 'center', }, premiumIcon: { @@ -286,10 +286,10 @@ class TodosWebview extends Component { ) : (
- +

{intl.formatMessage(messages.premiumInfo)}

{intl.formatMessage(messages.rolloutInfo)}

- { + const { stats } = this.stores.settings.all; + + // Hide todos layer on first app start but show on second + if (stats.appStarts <= 1) { + this._updateSettings({ + isTodosPanelVisible: false, + }); + } else if (stats.appStarts <= 2) { + this._updateSettings({ + isTodosPanelVisible: true, + }); + } + }; } -- cgit v1.2.3-54-g00ecf From 2e6902a0ef00a1e07ebabce3a2f61e6efc92c726 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 5 Sep 2019 12:02:56 +0200 Subject: polish todo preview text --- src/features/todos/components/TodosWebview.js | 4 ++-- src/features/todos/store.js | 1 + src/i18n/locales/en-US.json | 6 +++--- src/i18n/messages/src/features/todos/components/TodosWebview.json | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/features/todos') diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index fa530daed..44c94a3ff 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js @@ -17,7 +17,7 @@ const CLOSE_TODOS_BUTTON_SIZE = 35; const messages = defineMessages({ premiumInfo: { id: 'feature.todos.premium.info', - defaultMessage: '!!!The Franz Todos Preview is currently only available for Franz Premium accounts.', + defaultMessage: '!!!Franz Todos are available to premium users now!', }, upgradeCTA: { id: 'feature.todos.premium.upgrade', @@ -25,7 +25,7 @@ const messages = defineMessages({ }, rolloutInfo: { id: 'feature.todos.premium.rollout', - defaultMessage: '!!!Franz Todos will be available to everyone soon.', + defaultMessage: '!!!Everyone else will have to wait a little longer.', }, }); diff --git a/src/features/todos/store.js b/src/features/todos/store.js index 5c6abff4c..4691c90ea 100644 --- a/src/features/todos/store.js +++ b/src/features/todos/store.js @@ -30,6 +30,7 @@ export default class TodoStore extends FeatureStore { } @computed get isTodosPanelVisible() { + console.log('isTodosPanelVisible', 'delayAppState.isDelayAppScreenVisible', delayAppState.isDelayAppScreenVisible); if (delayAppState.isDelayAppScreenVisible) return false; if (this.settings.isTodosPanelVisible === undefined) return DEFAULT_TODOS_VISIBLE; diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index e09cca7d6..499d94ead 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -17,8 +17,8 @@ "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger", "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.", - "feature.todos.premium.info": "The Franz Todos Preview is currently only available for Franz Premium accounts.", - "feature.todos.premium.rollout": "Franz Todos will be available to everyone soon.", + "feature.todos.premium.info": "Franz Todos are available to premium users now!", + "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.", "feature.todos.premium.upgrade": "Upgrade Account", "global.api.unhealthy": "Can't connect to Franz online services", "global.franzProRequired": "Franz Professional Required", @@ -378,4 +378,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json index 2387112b4..9cc3325d1 100644 --- a/src/i18n/messages/src/features/todos/components/TodosWebview.json +++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json @@ -1,7 +1,7 @@ [ { "id": "feature.todos.premium.info", - "defaultMessage": "!!!The Franz Todos Preview is currently only available for Franz Premium accounts.", + "defaultMessage": "!!!Franz Todos are available to premium users now!", "file": "src/features/todos/components/TodosWebview.js", "start": { "line": 18, @@ -27,7 +27,7 @@ }, { "id": "feature.todos.premium.rollout", - "defaultMessage": "!!!Franz Todos will be available to everyone soon.", + "defaultMessage": "!!!Everyone else will have to wait a little longer.", "file": "src/features/todos/components/TodosWebview.js", "start": { "line": 26, -- cgit v1.2.3-54-g00ecf From f42ef7dc88323cd8f5af20a83fb8534aa78804b9 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 5 Sep 2019 12:06:53 +0200 Subject: remove console logs --- src/features/delayApp/Component.js | 1 - src/features/todos/store.js | 1 - 2 files changed, 2 deletions(-) (limited to 'src/features/todos') diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js index de5653f04..6344edb89 100644 --- a/src/features/delayApp/Component.js +++ b/src/features/delayApp/Component.js @@ -77,7 +77,6 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class const { defaultTrialPlan } = stores.features.features; if (!hadSubscription) { - console.log('directly activate trial'); actions.user.activateTrial({ planId: defaultTrialPlan }); gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature'); diff --git a/src/features/todos/store.js b/src/features/todos/store.js index 4691c90ea..5c6abff4c 100644 --- a/src/features/todos/store.js +++ b/src/features/todos/store.js @@ -30,7 +30,6 @@ export default class TodoStore extends FeatureStore { } @computed get isTodosPanelVisible() { - console.log('isTodosPanelVisible', 'delayAppState.isDelayAppScreenVisible', delayAppState.isDelayAppScreenVisible); if (delayAppState.isDelayAppScreenVisible) return false; if (this.settings.isTodosPanelVisible === undefined) return DEFAULT_TODOS_VISIBLE; -- cgit v1.2.3-54-g00ecf