locales/en.json

@@ -99,9 +99,8 @@
       },
       "mascotDialog": {
         "title": "Small tips",
-        "message": "No need for queues anymore, you will be notified when machines are ready !\n\nIf you have your head in the clouds, you can turn on notifications for your machine by clicking on it.\n\nIf you live off campus we have other laundromat available, check the settings !!!!",
-        "ok": "Settings",
-        "cancel": "Later"
+        "message": "No need for queues anymore, you will be notified when machines are ready !\n\nIf you have your head in the clouds, you can turn on notifications for your machine by clicking on it.",
+        "ok": "Got it!"
       }
     },
     "home": {
@@ -340,8 +339,6 @@
       "dashboardSub": "Edit what services to display on the dashboard",
       "proxiwashNotifReminder": "Machine running reminder",
       "proxiwashNotifReminderSub": "How many minutes before",
-      "proxiwashChangeWash": "Laundromat selection",
-      "proxiwashChangeWashSub": "Which laundromat to display",
       "information": "Information",
       "dashboardEdit": {
         "title": "Edit dashboard",

locales/fr.json

@@ -99,9 +99,8 @@
       },
       "mascotDialog": {
         "title": "Pour info",
-        "message": "Plus besoin de faire la queue, tu seras informé des machines disponibles !\n\nSi tu es tête en l'air, tu peux activer les notifications pour ta machine en cliquant dessus.\n\nSi tu habites hors du campus on a d'autre laverie disponible, vas voir dans les paramètres !!!!",
-        "ok": "Paramètres",
-        "cancel": "Plus tard"
+        "message": "Plus besoin de faire la queue, tu seras informé des machines disponibles !\n\nSi tu es tête en l'air, tu peux activer les notifications pour ta machine en cliquant dessus.",
+        "ok": "Mercé"
       }
     },
     "home": {
@@ -340,8 +339,6 @@
       "dashboardSub": "Choisis les services à afficher sur la dashboard",
       "proxiwashNotifReminder": "Rappel de machine en cours",
       "proxiwashNotifReminderSub": "Combien de minutes avant",
-      "proxiwashChangeWash": "Sélection de la laverie",
-      "proxiwashChangeWashSub": "Quel laverie à afficher",
       "information": "Informations",
       "dashboardEdit": {
         "title": "Modifier la dashboard",

src/screens/Other/Settings/SettingsScreen.js

@@ -338,8 +338,8 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
               {this.getProxiwashNotifPicker()}
             </View>
             <List.Item
-              title={i18n.t('screens.settings.proxiwashChangeWash')}
-              description={i18n.t('screens.settings.proxiwashChangeWashSub')}
+              title="Test"
+              description="Test"
               left={(props: ListIconPropsType): React.Node => (
                 <List.Icon
                   color={props.color}

src/screens/Proxiwash/ProxiwashScreen.js

@@ -406,15 +406,6 @@ class ProxiwashScreen extends React.Component<PropsType, StateType> {
     ];
   };
 
-  /**
-   * Callback used when the user clicks on the navigate to settings button.
-   * This will hide the banner and open the SettingsScreen
-   */
-  onGoToSettings = () => {
-    const {navigation} = this.props;
-    navigation.navigate('settings');
-  };
-
   /**
    * Shows a modal for the given item
    *
@@ -508,14 +499,10 @@ class ProxiwashScreen extends React.Component<PropsType, StateType> {
           message={i18n.t('screens.proxiwash.mascotDialog.message')}
           icon="information"
           buttons={{
-            action: {
-              message: i18n.t('screens.proxiwash.mascotDialog.ok'),
-              icon: 'cog',
-              onPress: this.onGoToSettings,
-            },
+            action: null,
             cancel: {
-              message: i18n.t('screens.proxiwash.mascotDialog.cancel'),
-              icon: 'close',
+              message: i18n.t('screens.proxiwash.mascotDialog.ok'),
+              icon: 'check',
             },
           }}
           emotion={MASCOT_STYLE.NORMAL}