Merge branch 'dev_phase2' into 05_May

ios/Invest.xcodeproj/project.pbxproj

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

ios/Invest/Info.plist

@@ -24,8 +24,6 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>UIRequiresFullScreen</key>
-<true/>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -92,6 +90,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

src/Screens/Home/HomeView.js

 import React from 'react';
 import {
   View,
-  Text,
   ImageBackground,
   StyleSheet,
   ScrollView,
 } from 'react-native';
 import HeaderHome from '../../components/Header/HeaderHome';
-import Footer from './Footer';
-import {HEIGHT, HEIGHTXD, toPriceVnd, getFontXD} from '../../Config/Functions';
+import {getFontXD} from '../../Config/Functions';
 import R from '../../assets/R';
-import AppText from '../../components/AppText';
 import SwiperComponent from './SwiperComponent';
 import PriceListView from './PriceListView';
 

src/Screens/Home/ItemPrice.js

@@ -23,14 +23,14 @@ const ItemPrice = (props) => {
                     <Text style={[styles.txtBlack, {marginBottom: HEIGHTXD(5)}]}>
                         {item.name}
                     </Text>
-                    <Progress.Bar progress={item.change}
-                                  width={WIDTHXD(200)}
-                                  height={HEIGHTXD(8)}
-                                  color={R.colors.green}
-                                  backgroundColor={R.colors.red}
-                                  borderWidth={0}
-                                  borderRadius={0}
-                    />
+                    {/*<Progress.Bar progress={item.change}*/}
+                    {/*              width={WIDTHXD(200)}*/}
+                    {/*              height={HEIGHTXD(8)}*/}
+                    {/*              color={R.colors.green}*/}
+                    {/*              backgroundColor={R.colors.red}*/}
+                    {/*              borderWidth={0}*/}
+                    {/*              borderRadius={0}*/}
+                    {/*/>*/}
                 </View>
                 <Block padding={[0, 0]} space={'between'} flex={1}>
                     <View
@@ -47,12 +47,12 @@ const ItemPrice = (props) => {
                                 justifyContent: 'space-between',
                                 alignItems: 'center',
                             }}>
-                            <Image source={item.isUp ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} />
-                            <Text style={[styles.txtBlack, {flexWrap: 'wrap', color: item.isUp ? R.colors.green : R.colors.red2}]}>
+                            <Image source={item.is_up ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} />
+                            <Text style={[styles.txtBlack, {flexWrap: 'wrap', color: item.is_up ? R.colors.green : R.colors.red2}]}>
                                 {item.change}
                             </Text>
                         </View>
-                        <Text style={[styles.txtMoney, {color: item.isUp ? R.colors.green : R.colors.red2}]}>{`${item.change}%`}</Text>
+                        <Text style={[styles.txtMoney, {color: item.is_up ? R.colors.green : R.colors.red2}]}>{`${item.change_percent}%`}</Text>
                     </View>
                 </Block>
                 <Block padding={[0, 0]} space={'between'} flex={1}>
@@ -73,9 +73,9 @@ const ItemPrice = (props) => {
 
                             <Text style={[styles.txtBlack, {flexWrap: 'wrap'}]}
                                   ellipsizeMode='tail'>
-                                {item.openPrice}
+                                {item.open_price}
                             </Text>
-                            <Image source={item.isUp ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} />
+                            <Image source={item.is_up ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} />
                         </View>
                         <View
                             style={{
@@ -84,7 +84,7 @@ const ItemPrice = (props) => {
                                 justifyContent: 'space-between',
                                 alignItems: 'center',
                             }}>
-                            <Text style={[styles.txtMoney, {color: R.colors.gray}]}>{item.closePrice}</Text>
+                            <Text style={[styles.txtMoney, {color: R.colors.gray6}]}>{item.close_price}</Text>
                             <Image source={R.images.iconCheck2} style={styles.imgIcon} />
                         </View>
                     </View>
@@ -104,7 +104,7 @@ const ItemPrice = (props) => {
                                 justifyContent: 'center',
                             }}>
                             <Text style={[styles.txtBlack, {flexWrap: 'wrap'}]}>
-                                {item.highPrice}
+                                {item.high_price}
                             </Text>
                             <Text style={[styles.txtGray, {flexWrap: 'wrap'}]}>
                                 H
@@ -116,7 +116,7 @@ const ItemPrice = (props) => {
                                 flexDirection: 'row',
                                 justifyContent: 'center',
                             }}>
-                            <Text style={styles.txtMoney}>{item.lowPrice}</Text>
+                            <Text style={styles.txtMoney}>{item.low_price}</Text>
                             <Text style={[styles.txtGray, {flexWrap: 'wrap'}]}>
                                 L
                             </Text>
@@ -167,7 +167,7 @@ const styles = StyleSheet.create({
 
     txtGray: {
         fontSize: getFontXD(28),
-        color: R.colors.gray,
+        color: R.colors.gray6,
     },
 
     txtTime: {

src/Screens/Home/PriceListView.js

-import React, {useState} from 'react';
+import React, {useState, useEffect} from 'react';
 import {
     View,
     Text,
@@ -105,7 +105,7 @@ const styles = StyleSheet.create({
         alignItems: 'center',
     },
     imgIcon: {
-        width: WIDTHXD(30),
+        width: WIDTHXD(20),
         height: WIDTHXD(35),
         resizeMode: 'contain',
     },

src/apis/Functions/Home.js

+import {GetData} from '../helpers';
+
+import url from '../url';
+
+export const getPriceTable = async (body) =>
+  GetData(url.urlGetPriceTable, body)
+    .then((res) => res)
+    .catch((err) => err);

src/apis/url.js

@@ -26,6 +26,7 @@ export default {
 
   //Home
   urlGetTransaction: root + 'api/v1/customers/statistic-transaction',
+  urlGetPriceTable: `${root}api/v1/customers/update-price-table`,
 
   //History
   urlGetListHistory: root + 'api/v1/customers/get-list-transaction-history',

src/assets/colors.js

@@ -45,6 +45,7 @@ const colors = {
   gray1: '#bfbfbf',
   gray4: '#e6e6e6',
   gray5: 'rgba(226,232,235, 1)',
+  gray6: '#929292',
   orange: '#FF9C00',
   lightBlue: '#1a8cff',
   lightBlue1: '#008ae6',