update newfeed

ios/Invest.xcodeproj/project.pbxproj

@@ -893,7 +893,7 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -926,7 +926,7 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

src/Screens/AccountVerification/Tab/Profile.js

@@ -93,6 +93,7 @@ const Profile = (props) => {
     ];
     const index = checkFormatArray([type, urlFont, urlBack, urlSign]);
     if (index === true) {
+      console.log('Data date', props.route.params);
       const data = createFormData(urlFont, urlBack, urlSign, {
         card_type: type.value,
         uid: props.user.uid,

src/Screens/Action/Transfer/TransferView.js

@@ -10,9 +10,19 @@ const TransferView = (props) => {
     <View style={{flex: 1}}>
       <HeaderBack title={'Chuyển khoản'} />
       <View style={{flex: 1, paddingHorizontal: 10, paddingTop: 10}}>
-        <TextField title={'Số tiền'} />
-        <TextField title={'Phương thức nạp'} />
-        <TextMulti numberLines={3} title={'Ghi chú'} />
+        <TextField
+          onChangeText={(val) => consoele.log(val)}
+          title={'Số tiền'}
+        />
+        <TextField
+          onChangeText={(val) => consoele.log(val)}
+          title={'Phương thức nạp'}
+        />
+        <TextMulti
+          onChangeText={(val) => consoele.log(val)}
+          numberLines={3}
+          title={'Ghi chú'}
+        />
       </View>
       <View style={styles.containerBtn}>
         <Button title={'Chuyển tiền'} />

src/Screens/Action/Wallet/WalletDeposit.js

@@ -28,7 +28,10 @@ const WalletDeposit = (props) => {
         <View style={styles.wrapBody}>
           <TextDisable value={'10010101'} title={'Số tài khoản CQG'} />
           <TextField title={'Số tiền'} isNumber={true} />
-          <TextMulti title={'Ghi chú'} />
+          <TextMulti
+            onChangeText={(val) => consoele.log(val)}
+            title={'Ghi chú'}
+          />
         </View>
       </View>
       <View style={styles.btnSend}>

src/Screens/Action/Wallet/WalletWithdraw.js

@@ -88,8 +88,15 @@ const WalletDeposit = (props) => {
             }}
           />
 
-          <TextField title={'Số tiền'} isNumber={true} />
-          <TextMulti title={'Ghi chú'} />
+          <TextField
+            onChangeText={(val) => consoele.log(val)}
+            title={'Số tiền'}
+            isNumber={true}
+          />
+          <TextMulti
+            onChangeText={(val) => consoele.log(val)}
+            title={'Ghi chú'}
+          />
         </View>
       </View>
       <View style={styles.btnSend}>

src/Screens/Menu/Profile/Tab/GeneralInfor.js

@@ -94,7 +94,11 @@ const GeneralInfor = (props) => {
             title={'Ngày sinh'}
           />
 
-          <TextMulti value={props.user.address} title={'Địa chỉ'} />
+          <TextMulti
+            onChangeText={(val) => consoele.log(val)}
+            value={props.user.address}
+            title={'Địa chỉ'}
+          />
 
           <View style={{height: 40}} />
           <View style={{justifyContent: 'center', alignItems: 'center'}}>

src/Screens/MethodPay/AddMethod.js

@@ -42,9 +42,19 @@ const AddMethodPay = (props) => {
           }}
         />
 
-        <TextField title={'Chi nhánh'} />
-        <TextField title={'Tên chủ tài khoản'} />
-        <TextField title={'Số tài khoản ngân hàng'} isNumber={true} />
+        <TextField
+          onChangeText={(val) => consoele.log(val)}
+          title={'Chi nhánh'}
+        />
+        <TextField
+          onChangeText={(val) => consoele.log(val)}
+          title={'Tên chủ tài khoản'}
+        />
+        <TextField
+          onChangeText={(val) => consoele.log(val)}
+          title={'Số tài khoản ngân hàng'}
+          isNumber={true}
+        />
       </View>
       <TouchableOpacity style={styles.btn}>
         <Text style={styles.txtAdd}>Thêm</Text>

src/Screens/NewFeed/NewFeed.js

@@ -13,10 +13,11 @@ const NewFeed = (props) => {
     <View style={{flex: 1}}>
       <HeaderDrawer title={'Tin tức'} isWhite={true} />
       <View style={{flex: 1, backgroundColor: 'white'}}>
-        <Tab1 />
+        {/* <Tab1 /> */}
 
-        {/* <Tab.Navigator
+        <Tab.Navigator
           initialRouteName="GeneralInfor"
+          swipeEnabled={true}
           tabBarOptions={{
             inactiveTintColor: '#929292',
             activeTintColor: '#1473E6',
@@ -26,14 +27,24 @@ const NewFeed = (props) => {
           <Tab.Screen
             name="Tab1"
             component={Tab1}
-            options={{tabBarLabel: 'Chiến lược'}}
+            options={{tabBarLabel: 'Tin tức'}}
           />
           <Tab.Screen
             name="Tab2"
             component={Tab2}
-            options={{tabBarLabel: 'Tin tức'}}
+            options={{tabBarLabel: 'Media'}}
+          />
+          <Tab.Screen
+            name="Tab3"
+            component={Tab2}
+            options={{tabBarLabel: 'Bảng giá'}}
+          />
+          <Tab.Screen
+            name="Tab4"
+            component={Tab2}
+            options={{tabBarLabel: 'Biểu đồ'}}
           />
-        </Tab.Navigator> */}
+        </Tab.Navigator>
       </View>
     </View>
   );

src/Screens/NewFeed/Tab1/Tab1.js

@@ -77,7 +77,7 @@ const NewFeed = (props) => {
     setisRefresh(true);
     const res = await getListNew({
       keyword: '',
-      category_id: '',
+      category_id: selected,
       platform: Platform.OS,
       page_size: 10,
       page_index: page + 1,
@@ -94,6 +94,19 @@ const NewFeed = (props) => {
     <View style={{flex: 1, backgroundColor: 'white'}}>
       <View style={styles.fillterView}>
         <ScrollView horizontal showsHorizontalScrollIndicator={false}>
+          <TouchableOpacity
+            onPress={() => {
+              setSelected('');
+            }}
+            style={[
+              styles.item,
+              selected == '' ? {backgroundColor: '#BCD7F8'} : {},
+            ]}>
+            <Text
+              style={[styles.txt, selected == '' ? {color: '#1C6AF6'} : {}]}>
+              Tất cả
+            </Text>
+          </TouchableOpacity>
           {fillters.map((e) => (
             <TouchableOpacity
               onPress={() => {
@@ -143,14 +156,15 @@ const styles = StyleSheet.create({
   },
   item: {
     backgroundColor: '#EBEBEB',
-    marginRight: 10,
+    marginRight: 5,
     paddingHorizontal: 10,
     paddingVertical: 6,
-    marginLeft: 20,
+    marginLeft: 5,
     borderRadius: 10,
   },
   txt: {
     fontSize: getFontXD(42),
     color: R.colors.black,
+    fontWeight: 'bold',
   },
 });