Merge branch 'dev' of https://git.nomadmania.travel/Viktoriia/nomadmania-app into chat

app.config.ts

@@ -23,7 +23,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   owner: 'nomadmaniaou',
   scheme: 'nm',
   // Should be updated after every production release (deploy to AppStore/PlayMarket)
-  version: '2.0.20',
+  version: '2.0.21',
   // Should be updated after every dependency change
   runtimeVersion: '1.5',
   orientation: 'portrait',
@@ -108,7 +108,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       "RECORD_AUDIO",
       'MODIFY_AUDIO_SETTINGS'
     ],
-    versionCode: 73 // next version submitted to Google Play needs to be higher than that 2.0.20
+    versionCode: 74 // next version submitted to Google Play needs to be higher than that 2.0.21
   },
   plugins: [
     [

package.json

@@ -86,6 +86,7 @@
     "react-native-tab-view": "^3.5.2",
     "react-native-video": "^6.5.0",
     "react-native-view-shot": "^3.7.0",
+    "react-native-wheel-pick": "^1.2.2",
     "react-native-walkthrough-tooltip": "^1.6.0",
     "uuid": "^10.0.0",
     "yup": "^1.3.3",

src/components/Calendar/InputDatePicker/index.tsx

@@ -40,6 +40,7 @@ export const InputDatePicker: FC<Props> = ({
         header={'Date of birth'}
         value={new Date(spinnerSelectedDate).toLocaleDateString()}
         isFocused={(b) => setVisible(b)}
+        onBlur={() => {}}
         inputMode={'none'}
         placeholder={'Choose a birth date'}
         formikError={formikError}

src/components/Calendar/SpinnerDatePicker.tsx

@@ -1,6 +1,8 @@
 import React, { FC, useState } from 'react';
 import { Colors } from '../../theme';
 import DateTimePicker, { DateTimePickerEvent } from '@react-native-community/datetimepicker';
+import { DatePicker } from 'react-native-wheel-pick';
+import { Platform } from 'react-native';
 
 type Props = {
   selectedDate: (date: Date) => void;
@@ -16,7 +18,14 @@ const SpinnerDatePicker: FC<Props> = ({ selectedDate }) => {
     }
   };
 
-  return (
+  const onChangeAndroid = (selectedSpinnerDate?: Date) => {
+    selectedDate(selectedSpinnerDate!);
+    setValue(selectedSpinnerDate!);
+  };
+
+  if (!value) return
+
+  return Platform.OS === 'ios' ? (
     <DateTimePicker
       value={value}
       textColor={Colors.DARK_BLUE}
@@ -26,6 +35,21 @@ const SpinnerDatePicker: FC<Props> = ({ selectedDate }) => {
       minimumDate={new Date(1930, 0, 1)}
       maximumDate={new Date()}
     />
+  ) : (
+    <DatePicker
+      date={value}
+      style={{
+        backgroundColor: 'white',
+        width: undefined,
+        marginVertical: 16,
+        height: 215
+      }}
+      onDateChange={onChangeAndroid}
+      minimumDate={new Date(1930, 0, 1)}
+      maximumDate={new Date()}
+      textColor={Colors.DARK_BLUE}
+      textSize={21}
+    />
   );
 };
 

src/components/Input/index.tsx

@@ -84,6 +84,16 @@ export const Input: FC<Props> = ({
           placeholder={placeholder}
           onChangeText={onChange}
           multiline={multiline}
+          contextMenuHidden={inputMode === 'none'}
+          caretHidden={inputMode === 'none'}
+          onPressIn={() => {
+            if (inputMode === 'none') {
+              setFocused(true);
+              if (isFocused) {
+                isFocused(true);
+              }
+            }
+          }}
           onFocus={() => {
             setFocused(true);
             if (isFocused) {