Put auto sub behind dev flags

app/services/BackgroundTaskService.js

@@ -6,7 +6,7 @@ import { HCAService } from '../services/HCAService';
 
 export function executeTask() {
   checkIntersect();
-  HCAService.findNewAuthorities();
+  __DEV__ && HCAService.findNewAuthorities();
 }
 
 export default class BackgroundTaskServices {

app/views/ChooseProvider.js

@@ -235,13 +235,15 @@ class ChooseProviderScreen extends Component {
           <Typography style={styles.sectionDescription} use={'body1'}>
             {languages.t('label.authorities_desc')}
           </Typography>
-          <TouchableOpacity style={styles.autoSubcribe}>
-            <Checkbox
-              label={languages.t('label.auto_subscribe_checkbox')}
-              checked={this.state.isAutoSubscribed}
-              onPress={() => this.toggleAutoSubscribe()}
-            />
-          </TouchableOpacity>
+          {__DEV__ && (
+            <TouchableOpacity style={styles.autoSubcribe}>
+              <Checkbox
+                label={languages.t('label.auto_subscribe_checkbox')}
+                checked={this.state.isAutoSubscribed}
+                onPress={() => this.toggleAutoSubscribe()}
+              />
+            </TouchableOpacity>
+          )}
         </View>
 
         <View style={styles.listContainer}>

app/views/onboarding/Onboarding5.js

@@ -83,7 +83,7 @@ class Onboarding extends Component {
   componentDidMount() {
     this.checkLocationStatus();
     isPlatformiOS() && this.checkNotificationStatus();
-    this.checkSubsriptionStatus();
+    __DEV__ && this.checkSubsriptionStatus();
   }
 
   isLocationChecked() {
@@ -106,11 +106,9 @@ class Onboarding extends Component {
   getNextStep(currentStep) {
     switch (currentStep) {
       case StepEnum.LOCATION:
-        return isPlatformiOS()
-          ? StepEnum.NOTIFICATIONS
-          : StepEnum.HCA_SUBSCRIPTION;
+        return this.getLocationNextStep();
       case StepEnum.NOTIFICATIONS:
-        return StepEnum.HCA_SUBSCRIPTION;
+        return __DEV__ ? StepEnum.HCA_SUBSCRIPTION : StepEnum.DONE;
       case StepEnum.HCA_SUBSCRIPTION:
         return StepEnum.DONE;
     }
@@ -175,6 +173,16 @@ class Onboarding extends Component {
     }
   }
 
+  getLocationNextStep() {
+    if (isPlatformiOS()) {
+      return StepEnum.NOTIFICATIONS;
+    } else if (__DEV__) {
+      return StepEnum.HCA_SUBSCRIPTION;
+    } else {
+      return isPlatformiOS() ? StepEnum.NOTIFICATIONS : StepEnum.DONE;
+    }
+  }
+
   /**
    * Gets the respective location permissions settings string
    * for the user's current device.
@@ -427,7 +435,7 @@ class Onboarding extends Component {
             <View style={styles.statusContainer}>
               {this.getLocationPermission()}
               {this.getNotificationsPermissionIfIOS()}
-              {this.getAuthSubscriptionStatus()}
+              {__DEV__ && this.getAuthSubscriptionStatus()}
               <View style={styles.spacer} />
             </View>
           </View>

e2e/helpers/onboarding.js

@@ -23,20 +23,8 @@ export const navigateThroughPermissions = async languageStrings => {
   await Onboarding4.tapButton(languageStrings);
 };
 
-export const navigateThroughOnboarding = async (
-  languageStrings,
-  isAutoSubcribe = true,
-) => {
+export const navigateThroughOnboarding = async languageStrings => {
   await navigateThroughPermissions(languageStrings);
-
-  await EnableAuthoritySubscription.isOnScreen(languageStrings);
-
-  if (isAutoSubcribe) {
-    await EnableAuthoritySubscription.enable(languageStrings);
-  } else {
-    await EnableAuthoritySubscription.skipStep(languageStrings);
-  }
-
   await FinishSetup.isOnScreen(languageStrings);
   await FinishSetup.takeScreenshot(languageStrings);
   await FinishSetup.tapButton(languageStrings);