Merge branch 'thuynt_change_bank_view' into '08_April'

fix bug bank dialog

See merge request !3

android/app/BUCK

@@ -35,12 +35,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "com.invest",
+    package = "com.dcv.invest",
 )
 
 android_resource(
     name = "res",
-    package = "com.invest",
+    package = "com.dcv.invest",
     res = "src/main/res",
 )
 

android/app/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.invest">
+  package="com.dcv.invest">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA"/>

android/app/src/main/java/com/invest/MainActivity.java → android/app/src/main/java/com/dcv/invest/MainActivity.java

-package com.invest;
+package com.dcv.invest;
 import android.os.Bundle;
 import com.facebook.react.ReactActivity;
 import com.zoontek.rnbootsplash.RNBootSplash; 

android/app/src/main/java/com/invest/MainApplication.java → android/app/src/main/java/com/dcv/invest/MainApplication.java

-package com.invest;
+package com.dcv.invest;
 
 import android.app.Application;
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.reactnativecommunity.netinfo.NetInfoPackage;
-import com.zoontek.rnbootsplash.RNBootSplashPackage;
-import com.zoontek.rnbootsplash.RNBootSplashPackage;
-import com.BV.LinearGradient.LinearGradientPackage;
-import com.oblador.vectoricons.VectorIconsPackage;
-import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
-import com.facebook.react.ReactApplication; //<- Dòng này
-import com.zoontek.rnbootsplash.RNBootSplashPackage; 
+
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -72,7 +66,7 @@ public class MainApplication extends Application implements ReactApplication {
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.invest.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.dcv.invest.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);

ios/Invest/Info.plist

@@ -44,7 +44,7 @@
 	<key>NSCameraUsageDescription</key>
 	<string>Accect connect camera</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>To upload images</string>
 	<key>UIAppFonts</key>

src/Screens/MethodPay/SelectBankModal.js

-import React, {useState, useEffect} from 'react';
+import React, {useState,useEffect} from 'react';
 import {
   Text,
   View,
@@ -8,8 +8,6 @@ import {
   StyleSheet,
   TextInput,
   ActivityIndicator,
-  SafeAreaView,
-  StatusBar,
 } from 'react-native';
 import _ from 'lodash';
 import AntDesign from 'react-native-vector-icons/AntDesign';
@@ -23,16 +21,17 @@ import {
 } from '../../Config/Functions';
 import I18n from '../../helper/i18/i18n';
 import ItemBank from './ItemBank';
+import {SafeAreaView} from 'react-native-safe-area-context';
 
 const SelectBankModal = (props) => {
-  console.log(props);
+  console.log(props)
   const [modalVisible, setModalVisible] = useState(false);
   const [valueSearch, setValueSearch] = useState('');
   const [result, setResult] = useState(props.data);
   const [keySearch, setKeySearch] = useState('');
-  useEffect(() => {
-    setResult(props.data);
-  }, [props.data]);
+  useEffect(()=>{
+    setResult(props.data)
+  },[props.data])
   const localFilter = (data, allowFields = [], search_text) => {
     if (!data) return [];
     if (!search_text || search_text === '') return data;
@@ -60,12 +59,15 @@ const SelectBankModal = (props) => {
   };
   const _onSearch = async (keySearch) => {
     const data = props.data
-      ? localFilter(props.data, ['code', 'name'], keySearch).map((x) => ({
+        ? localFilter(props.data, ['code', 'name'], keySearch)
+            .map(
+                (x) => ({
                   id: x.id,
                   code: x.code,
                   name: x.name,
                   logo: x.logo,
-        }))
+                })
+            )
         : [];
 
     // remove duplicate
@@ -77,8 +79,8 @@ const SelectBankModal = (props) => {
     setResult(result);
   };
   const _onPressItem = (item) => {
-    console.log('_onPressItem', item);
-    props.onPressItem(item);
+    console.log('_onPressItem', item)
+    props.onPressItem(item)
     setValueSearch(item ? item.name : '');
     setModalVisible(false);
   };
@@ -129,11 +131,13 @@ const SelectBankModal = (props) => {
             </View>
           </View>
         </TouchableOpacity>
+
         <Modal
             animated={true}
             animationType="fade"
             visible={modalVisible}
-        presentationStyle="pageSheet">
+        >
+          <SafeAreaView>
             <View style={styles.overViewModal}>
               <View style={[styles.container]}>
                 <View style={styles.viewTitle}>
@@ -176,18 +180,21 @@ const SelectBankModal = (props) => {
                             renderItem={({item, index}) => (
                                 <ItemBank
                                     item={item}
-                        isEndItem={index == result.length - 1}
+                                    isEndItem = {index == result.length - 1}
                                     onPress={(item) => _onPressItem(item)}
                                 />
                             )}
                         />
                       </View>
                   ) : (
-                <Text style={styles.txtEmpty}>{I18n.t('NullDataSearch')}</Text>
+                      <Text style={styles.txtEmpty}>
+                        {I18n.t('NullDataSearch')}
+                      </Text>
                   )}
                 </View>
               </View>
             </View>
+          </SafeAreaView>
         </Modal>
       </View>
   );
@@ -209,14 +216,14 @@ const styles = StyleSheet.create({
   viewTitle: {
     width: getWidth(),
     height: HEIGHTXD(85),
-    marginTop: WIDTHXD(90),
+    marginTop: WIDTHXD(30),
     flexDirection: 'row',
     justifyContent: 'center',
     position: 'relative',
   },
   txtTitle: {
     marginRight: WIDTHXD(24),
-    color: R.colors.black0,
+    color: R.colors.black,
     fontSize: getFontXD(42),
   },
   viewContent: {
@@ -235,7 +242,7 @@ const styles = StyleSheet.create({
   },
   flatlist: {
     width: getWidth(),
-    marginBottom: HEIGHTXD(250),
+    marginBottom: HEIGHTXD(300)
   },
   input: {
     height: WIDTHXD(99),
@@ -281,14 +288,12 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-between',
     alignItems: 'center',
-    paddingHorizontal: WIDTHXD(24),
+    paddingHorizontal: WIDTHXD(5),
   },
   overViewModal: {
-    height: '100%',
     justifyContent: 'center',
     alignItems: 'center',
     backgroundColor: '#rgba(0,0,0,0.7)',
-    margin: 0,
   },
   btClose: {
     alignSelf: 'center',