Resolve nativeapp PR Issues

- Comment out handleGeoStationary code - Remove conditional check for sms toast - Rename EXCLUDED_COUNTRIES
Plant-for-the-Planet-org · Feb 27, 2024 · dbd5f7a · dbd5f7a
1 parent 372a0bc
commit dbd5f7a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/apps/nativeapp/app/components/phoneInput/PhoneInput.tsx b/apps/nativeapp/app/components/phoneInput/PhoneInput.tsx
@@ -4,7 +4,7 @@ import PhoneNoInput from 'react-native-phone-number-input';
 import {CountryCode} from 'react-native-country-picker-modal';
 
 import {Colors, Typography} from '../../styles';
-import {EXCLUDED_COUNTRIES, EXCLUDED_COUNTRIES_WHATSAPP} from '../../constants';
+import {DISABLE_SMS_COUNTRY_CODE , DISABLE_WHATSAPP_COUNTRY_CODE} from '../../constants';
 
 const IS_ANDROID = Platform.OS === 'android';
 
@@ -39,10 +39,10 @@ const PhoneInput = ({
     inputValue(formattedValue);
     if ((
         verificationType === 'Sms' &&
-        EXCLUDED_COUNTRIES.includes(countryCode)
+        DISABLE_SMS_COUNTRY_CODE.includes(countryCode)
         ) || (
         verificationType === 'Whatsapp' && 
-        EXCLUDED_COUNTRIES_WHATSAPP.includes(countryCode)
+        DISABLE_WHATSAPP_COUNTRY_CODE.includes(countryCode)
       )) {
       destinationFlag(true);
       return;

diff --git a/apps/nativeapp/app/constants/index.tsx b/apps/nativeapp/app/constants/index.tsx
@@ -15,8 +15,8 @@ const POINT_RADIUS_ARR = [
   {name: 'Within 1 km', value: 1000},
 ];
 
-// Excluded countries for sms type alert methods
-const EXCLUDED_COUNTRIES = [
+// Disable sms and whatsapp alert methods for some countries
+const DISABLE_SMS_COUNTRY_CODE = [
   'RU',
   'TJ',
   'MG',
@@ -30,8 +30,8 @@ const EXCLUDED_COUNTRIES = [
   'BZ',
 ];
 
-const EXCLUDED_COUNTRIES_WHATSAPP = [
+const DISABLE_WHATSAPP_COUNTRY_CODE = [
   'IN'
 ]
 
-export {WEB_URLS, RADIUS_ARR, POINT_RADIUS_ARR, EXCLUDED_COUNTRIES, EXCLUDED_COUNTRIES_WHATSAPP};
+export {WEB_URLS, RADIUS_ARR, POINT_RADIUS_ARR, DISABLE_SMS_COUNTRY_CODE, DISABLE_WHATSAPP_COUNTRY_CODE};
diff --git a/apps/nativeapp/app/screens/Settings/Settings.tsx b/apps/nativeapp/app/screens/Settings/Settings.tsx
@@ -456,21 +456,21 @@ const Settings = ({navigation}) => {
     });
   };
 
-  const handleGeostationary = val => {
-    let detectionMethods = [...userDetails?.data?.detectionMethods];
-    if (!val) {
-      detectionMethods = detectionMethods.filter(el => el !== 'GEOSTATIONARY');
-    } else {
-      detectionMethods = [...detectionMethods, 'GEOSTATIONARY'];
-    }
-    updateUser.mutate({
-      json: {
-        body: {
-          detectionMethods,
-        },
-      },
-    });
-  };
+  // const handleGeostationary = val => {
+  //   let detectionMethods = [...userDetails?.data?.detectionMethods];
+  //   if (!val) {
+  //     detectionMethods = detectionMethods.filter(el => el !== 'GEOSTATIONARY');
+  //   } else {
+  //     detectionMethods = [...detectionMethods, 'GEOSTATIONARY'];
+  //   }
+  //   updateUser.mutate({
+  //     json: {
+  //       body: {
+  //         detectionMethods,
+  //       },
+  //     },
+  //   });
+  // };
 
   const handleWebhook = () => {
     navigation.navigate('Verification', {

diff --git a/apps/nativeapp/app/screens/Verification/Verification.tsx b/apps/nativeapp/app/screens/Verification/Verification.tsx
@@ -88,7 +88,7 @@ const Verification = ({navigation, route}) => {
       (verificationType === 'Sms' && limitDestination)
     ) {
       return toast.show(
-        `Apologies, ${verificationType === 'Sms' ? 'sms' : 'WhatsApp'} services to your region are currently unsupported. Please select a different method.`,
+        `Apologies, sms services to your region are currently unsupported. Please select a different method.`,
         {
           type: 'warning',
         },