aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-09-05 11:50:52 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-09-05 11:50:52 +0200
commitcbde6455dbe25cbc5da3f4fd33add6b533d6d89a (patch)
tree707674d41f287d173e28c6466c140b50adaac394 /src/containers/settings
parentMerge branch 'develop' into i18n (diff)
parentRevert "create test build" (diff)
downloadferdium-app-cbde6455dbe25cbc5da3f4fd33add6b533d6d89a.tar.gz
ferdium-app-cbde6455dbe25cbc5da3f4fd33add6b533d6d89a.tar.zst
ferdium-app-cbde6455dbe25cbc5da3f4fd33add6b533d6d89a.zip
Merge branch 'develop' into i18n
Diffstat (limited to 'src/containers/settings')
-rw-r--r--src/containers/settings/AccountScreen.js2
-rw-r--r--src/containers/settings/TeamScreen.js1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index f9eae4957..9c74cf2ab 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -42,6 +42,8 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
42 <ErrorBoundary> 42 <ErrorBoundary>
43 <AccountDashboard 43 <AccountDashboard
44 user={user.data} 44 user={user.data}
45 isPremiumOverrideUser={user.isPremiumOverride}
46 isProUser={user.isPro}
45 isLoading={isLoadingUserInfo} 47 isLoading={isLoadingUserInfo}
46 isLoadingPlans={isLoadingPlans} 48 isLoadingPlans={isLoadingPlans}
47 userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError} 49 userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index b7b1b78cb..f600c9947 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -30,6 +30,7 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
30 userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError} 30 userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
31 retryUserInfoRequest={() => this.reloadData()} 31 retryUserInfoRequest={() => this.reloadData()}
32 openTeamManagement={() => this.handleWebsiteLink('/user/team')} 32 openTeamManagement={() => this.handleWebsiteLink('/user/team')}
33 isProUser={user.isPro}
33 /> 34 />
34 </ErrorBoundary> 35 </ErrorBoundary>
35 ); 36 );