diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-09-04 15:37:56 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-09-04 15:37:56 +0200 |
commit | c6dda35baf7eb9a7d89bf224c38973a1b6171c14 (patch) | |
tree | 98f562911fcccc356a0594427f6891ce0e12f22a /src/components/settings | |
parent | Fix icons & button color (diff) | |
download | ferdium-app-c6dda35baf7eb9a7d89bf224c38973a1b6171c14.tar.gz ferdium-app-c6dda35baf7eb9a7d89bf224c38973a1b6171c14.tar.zst ferdium-app-c6dda35baf7eb9a7d89bf224c38973a1b6171c14.zip |
bugfixing & polishing
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 19 | ||||
-rw-r--r-- | src/components/settings/recipes/RecipesDashboard.js | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 900a83a78..4fd1e8163 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -93,9 +93,11 @@ const messages = defineMessages({ | |||
93 | }, | 93 | }, |
94 | }); | 94 | }); |
95 | 95 | ||
96 | export default @observer class AccountDashboard extends Component { | 96 | @observer |
97 | class AccountDashboard extends Component { | ||
97 | static propTypes = { | 98 | static propTypes = { |
98 | user: MobxPropTypes.observableObject.isRequired, | 99 | user: MobxPropTypes.observableObject.isRequired, |
100 | isProUser: PropTypes.bool.isRequired, | ||
99 | isLoading: PropTypes.bool.isRequired, | 101 | isLoading: PropTypes.bool.isRequired, |
100 | userInfoRequestFailed: PropTypes.bool.isRequired, | 102 | userInfoRequestFailed: PropTypes.bool.isRequired, |
101 | retryUserInfoRequest: PropTypes.func.isRequired, | 103 | retryUserInfoRequest: PropTypes.func.isRequired, |
@@ -115,6 +117,7 @@ export default @observer class AccountDashboard extends Component { | |||
115 | render() { | 117 | render() { |
116 | const { | 118 | const { |
117 | user, | 119 | user, |
120 | isProUser, | ||
118 | isLoading, | 121 | isLoading, |
119 | userInfoRequestFailed, | 122 | userInfoRequestFailed, |
120 | retryUserInfoRequest, | 123 | retryUserInfoRequest, |
@@ -234,11 +237,13 @@ export default @observer class AccountDashboard extends Component { | |||
234 | </> | 237 | </> |
235 | )} | 238 | )} |
236 | <div className="manage-user-links"> | 239 | <div className="manage-user-links"> |
237 | <Button | 240 | {!isProUser && ( |
238 | label={intl.formatMessage(messages.upgradeAccountToPro)} | 241 | <Button |
239 | className="franz-form__button--primary" | 242 | label={intl.formatMessage(messages.upgradeAccountToPro)} |
240 | onClick={upgradeToPro} | 243 | className="franz-form__button--primary" |
241 | /> | 244 | onClick={upgradeToPro} |
245 | /> | ||
246 | )} | ||
242 | <Button | 247 | <Button |
243 | label={intl.formatMessage(messages.manageSubscriptionButtonLabel)} | 248 | label={intl.formatMessage(messages.manageSubscriptionButtonLabel)} |
244 | className="franz-form__button--inverted" | 249 | className="franz-form__button--inverted" |
@@ -290,3 +295,5 @@ export default @observer class AccountDashboard extends Component { | |||
290 | ); | 295 | ); |
291 | } | 296 | } |
292 | } | 297 | } |
298 | |||
299 | export default AccountDashboard; | ||
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 75e60b7ec..08988024a 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -218,7 +218,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com | |||
218 | <> | 218 | <> |
219 | <H2> | 219 | <H2> |
220 | {intl.formatMessage(messages.headlineCustomRecipes)} | 220 | {intl.formatMessage(messages.headlineCustomRecipes)} |
221 | {isCommunityRecipesIncludedInCurrentPlan && ( | 221 | {!isCommunityRecipesIncludedInCurrentPlan && ( |
222 | <ProBadge className={classes.proBadge} /> | 222 | <ProBadge className={classes.proBadge} /> |
223 | )} | 223 | )} |
224 | </H2> | 224 | </H2> |
@@ -247,7 +247,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com | |||
247 | </> | 247 | </> |
248 | )} | 248 | )} |
249 | <PremiumFeatureContainer | 249 | <PremiumFeatureContainer |
250 | condition={(recipeFilter === 'dev' && communityRecipes.length > 0) && isCommunityRecipesIncludedInCurrentPlan} | 250 | condition={(recipeFilter === 'dev' && communityRecipes.length > 0) && !isCommunityRecipesIncludedInCurrentPlan} |
251 | > | 251 | > |
252 | {recipeFilter === 'dev' && communityRecipes.length > 0 && ( | 252 | {recipeFilter === 'dev' && communityRecipes.length > 0 && ( |
253 | <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3> | 253 | <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3> |