Improve serviceLimit implementation

3 files changed, 8 insertions, 4 deletions

diff --git a/src/features/serviceLimit/components/LimitReachedInfobox.js b/src/features/serviceLimit/components/LimitReachedInfobox.js
index ee0d7cb27..fc54dcf85 100644
--- a/src/features/serviceLimit/components/LimitReachedInfobox.js
+++ b/src/features/serviceLimit/components/LimitReachedInfobox.js
@@ -26,6 +26,10 @@ const styles = theme => ({
     borderRadius: 0,
     marginBottom: 0,
 
+    '& > div': {
+      marginBottom: 0,
+    },
+
     '& button': {
       color: theme.styleTypes.primary.contrast,
     },
diff --git a/src/features/serviceLimit/index.js b/src/features/serviceLimit/index.js
index 76f996195..92ad8bb98 100644
--- a/src/features/serviceLimit/index.js
+++ b/src/features/serviceLimit/index.js
@@ -15,7 +15,7 @@ export default function initServiceLimit(stores, actions) {
   // Toggle serviceLimit feature
   reaction(
     () => (
-      features.features.hasServiceLimit
+      features.features.isServiceLimitEnabled
     ),
     (isEnabled) => {
       if (isEnabled) {
diff --git a/src/features/serviceLimit/store.js b/src/features/serviceLimit/store.js
index 752f71371..9836c5f51 100644
--- a/src/features/serviceLimit/store.js
+++ b/src/features/serviceLimit/store.js
@@ -24,12 +24,12 @@ export class ServiceLimitStore extends FeatureStore {
   @computed get userHasReachedServiceLimit() {
     if (!this.isServiceLimitEnabled) return false;
 
-    const { user } = this.stores;
-
-    return !user.isPremium && this.serviceCount >= this.serviceLimit;
+    return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit;
   }
 
   @computed get serviceLimit() {
+    if (!this.isServiceLimitEnabled || this.stores.features.features.serviceLimitCount === 0) return 0;
+
     return this.stores.features.features.serviceLimitCount || DEFAULT_SERVICE_LIMIT;
   }