diff options
author | 2019-06-13 15:48:23 +0200 | |
---|---|---|
committer | 2019-06-13 15:48:23 +0200 | |
commit | e5fbcfc9eb02a1cbb1c5876a3c1a01f79ad15180 (patch) | |
tree | 676d3c5478a7279d3cf510ad3f620ed2d3a76491 /src/containers | |
parent | Add custom recipe limitation (diff) | |
parent | Merge branch 'release/5.2.0-beta.2' (diff) | |
download | ferdium-app-e5fbcfc9eb02a1cbb1c5876a3c1a01f79ad15180.tar.gz ferdium-app-e5fbcfc9eb02a1cbb1c5876a3c1a01f79ad15180.tar.zst ferdium-app-e5fbcfc9eb02a1cbb1c5876a3c1a01f79ad15180.zip |
Merge branch 'develop' into feature/3rd-party-limit
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 3 | ||||
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 2 | ||||
-rw-r--r-- | src/containers/settings/AccountScreen.js | 1 | ||||
-rw-r--r-- | src/containers/subscription/SubscriptionFormScreen.js | 1 | ||||
-rw-r--r-- | src/containers/subscription/SubscriptionPopupScreen.js | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index e63f40c06..1f9c1ea61 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -51,6 +51,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer | |||
51 | isHealthCheckLoading={app.healthCheckRequest.isExecuting} | 51 | isHealthCheckLoading={app.healthCheckRequest.isExecuting} |
52 | isFullScreen={app.isFullScreen} | 52 | isFullScreen={app.isFullScreen} |
53 | darkMode={app.isSystemDarkModeEnabled} | 53 | darkMode={app.isSystemDarkModeEnabled} |
54 | installAppUpdate={actions.app.installUpdate} | ||
55 | nextAppReleaseVersion={app.nextAppReleaseVersion} | ||
56 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | ||
54 | > | 57 | > |
55 | {children} | 58 | {children} |
56 | </AuthLayout> | 59 | </AuthLayout> |
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index d2891a6a4..d290a6094 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -23,7 +23,6 @@ import { state as delayAppState } from '../../features/delayApp'; | |||
23 | import { workspaceActions } from '../../features/workspaces/actions'; | 23 | import { workspaceActions } from '../../features/workspaces/actions'; |
24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
25 | import { workspaceStore } from '../../features/workspaces'; | 25 | import { workspaceStore } from '../../features/workspaces'; |
26 | import { announcementsStore } from '../../features/announcements'; | ||
27 | 26 | ||
28 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 27 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
29 | static defaultProps = { | 28 | static defaultProps = { |
@@ -151,7 +150,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
151 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 150 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
152 | darkMode={settings.all.app.darkMode} | 151 | darkMode={settings.all.app.darkMode} |
153 | isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} | 152 | isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} |
154 | isAnnouncementVisible={announcementsStore.isAnnouncementVisible} | ||
155 | > | 153 | > |
156 | {React.Children.count(children) > 0 ? children : null} | 154 | {React.Children.count(children) > 0 ? children : null} |
157 | </AppLayout> | 155 | </AppLayout> |
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index b3f967353..66076504f 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -27,7 +27,6 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend | |||
27 | const { actions, stores } = this.props; | 27 | const { actions, stores } = this.props; |
28 | 28 | ||
29 | const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`; | 29 | const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`; |
30 | console.log(url); | ||
31 | 30 | ||
32 | actions.app.openExternalUrl({ url }); | 31 | actions.app.openExternalUrl({ url }); |
33 | } | 32 | } |
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js index cb67ee7f2..aa1166f5e 100644 --- a/src/containers/subscription/SubscriptionFormScreen.js +++ b/src/containers/subscription/SubscriptionFormScreen.js | |||
@@ -56,6 +56,7 @@ export default @inject('stores', 'actions') @observer class SubscriptionFormScre | |||
56 | minWidth: 600, | 56 | minWidth: 600, |
57 | webPreferences: { | 57 | webPreferences: { |
58 | nodeIntegration: true, | 58 | nodeIntegration: true, |
59 | webviewTag: true, | ||
59 | }, | 60 | }, |
60 | }); | 61 | }); |
61 | paymentWindow.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`); | 62 | paymentWindow.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`); |
diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js index 6641f236d..f76d6c5a6 100644 --- a/src/containers/subscription/SubscriptionPopupScreen.js +++ b/src/containers/subscription/SubscriptionPopupScreen.js | |||
@@ -13,7 +13,7 @@ export default @inject('stores', 'actions') @observer class SubscriptionPopupScr | |||
13 | completeCheck(event) { | 13 | completeCheck(event) { |
14 | const { url } = event; | 14 | const { url } = event; |
15 | 15 | ||
16 | if (url.includes('recurly') && url.includes('confirmation')) { | 16 | if ((url.includes('recurly') && url.includes('confirmation')) || (url.includes('meetfranz') && url.includes('success'))) { |
17 | this.setState({ | 17 | this.setState({ |
18 | complete: true, | 18 | complete: true, |
19 | }); | 19 | }); |