diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 58a3e6e..749e228 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -841,8 +841,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 5c42585573ad5f1ea485444beac314a8d0944270
-  BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
+  boost: 099eb71dcf2a2717110f77e84c1b0aaa2a701795
+  BVLinearGradient: cb006ba232a1f3e4f341bb62c42d1098c284da70
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBAEMKit: e34530df538b8eb8aeb53c35867715ba6c63ef0c
   FBLazyVector: 748c0ef74f2bf4b36cfcccf37916806940a64c32
@@ -882,9 +882,9 @@ SPEC CHECKSUMS:
   React-jsiexecutor: e50b839f530379929217443355d754be4567566d
   React-jsinspector: 194e32c6aab382d88713ad3dd0025c5f5c4ee072
   React-logger: 39440454dfd719978689203a9d18b94e98de09eb
-  react-native-camera: 35854c4f764a4a6cf61c1c3525888b92f0fe4b31
-  react-native-cameraroll: 2225908e97d553ad388e2a0207a5c2b0b3aed241
-  react-native-fbsdk-next: 1baeeacf0ecdeb839cca16ca75cb16a9bbbf8e03
+  react-native-camera: 22dbf8ce6a4c6a25ae49f4e2fa5859c5277f1631
+  react-native-cameraroll: 00d73585135a54968912cbeffa2845e83c517b88
+  react-native-fbsdk-next: 52f81e60eb3e8e0e06cf9728b4572d3509ca9d01
   react-native-pager-view: 873aef831fb4fe6e1a2e1ba7a79857e240dea380
   react-native-splash-screen: 95994222cc95c236bd3cdc59fe45ed5f27969594
   react-native-view-shot: d1a701eb0719c6dccbd20b4bb43b1069f304cb70
@@ -907,7 +907,7 @@ SPEC CHECKSUMS:
   React-utils: ee4e6bf16d6882500500d517d36f9035874c5f6a
   ReactCommon: 3a7c359a28c6973c304fb1b0152b096b195dd5fc
   RNAppleAuthentication: c5d311a3a5b1be91d077c217481d8fecf72cfa81
-  RNCAsyncStorage: 23e56519cc41d3bade3c8d4479f7760cb1c11996
+  RNCAsyncStorage: b44e8a4e798c3e1f56bffccd0f591f674fb9198f
   RNDateTimePicker: 21fbf94479a551f0e50d37e662febe03e16b7012
   RNDeviceInfo: e958a6b5adfb7b16d360fb138affe8fc2cfdc288
   RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
diff --git a/ios/csareactrn60.xcodeproj/project.pbxproj b/ios/csareactrn60.xcodeproj/project.pbxproj
index 2ab74d3..8e2908c 100644
--- a/ios/csareactrn60.xcodeproj/project.pbxproj
+++ b/ios/csareactrn60.xcodeproj/project.pbxproj
@@ -689,14 +689,14 @@
 				CODE_SIGN_ENTITLEMENTS = csareactrn60/csareactrn60.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 177;
+				CURRENT_PROJECT_VERSION = 162;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 84F3R56BUC;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 84F3R56BUC;
 				INFOPLIST_FILE = csareactrn60/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.109;
+				MARKETING_VERSION = 2.108;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -720,13 +720,13 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 177;
+				CURRENT_PROJECT_VERSION = 162;
 				DEVELOPMENT_TEAM = 84F3R56BUC;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 84F3R56BUC;
 				INFOPLIST_FILE = csareactrn60/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.109;
+				MARKETING_VERSION = 2.108;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/src/screens/login/Login.js b/src/screens/login/Login.js
index 8a907d9..e9521e0 100644
--- a/src/screens/login/Login.js
+++ b/src/screens/login/Login.js
@@ -42,25 +42,29 @@ class LoginScreen extends Component {
 
       if (regex.test(this.state.username) === true) {
         console.log('true')
-        const fcm = messaging()
-        if (!await fcm.hasPermission()) {
-          try {
-            await messaging().requestPermission()
-          } catch (error) {
-          }
-        }
+        // const fcm = messaging()
+        // if (!await fcm.hasPermission()) {
+        //   try {
+        //     await messaging().requestPermission()
+        //   } catch (error) {
+        //     this.setState({
+        //       isLoading: false
+        //     })
+        //   }
+        // }
 
-        const fcmToken = await messaging().getAPNSToken()
+        // const fcmToken = await messaging().getAPNSToken()
+        
 
         let params = {
           // mobile: this.state.username,
           username: this.state.username,
           password: this.state.password,
-          fcm_token: fcmToken
+          // fcm_token: fcmToken
         }
 
         console.log('params >> ', params)
-        console.log('fcmToken >>>>>>>>>>>>>>>>>>>>>>>>> ', fcmToken)
+        // console.log('fcmToken >>>>>>>>>>>>>>>>>>>>>>>>> ', fcmToken)
         this.setState({isLoading:true})
         login(params)
           .then((res) => {
diff --git a/src/screens/object/MessageObjectDetail.js b/src/screens/object/MessageObjectDetail.js
index 4737cd7..0197958 100644
--- a/src/screens/object/MessageObjectDetail.js
+++ b/src/screens/object/MessageObjectDetail.js
@@ -6,6 +6,7 @@ import Text from '../../components/Text';
 import {getObjectMessageByID} from '../../api/UserApi'
 import moment from 'moment';
 import { t } from '../../utils/i18n'
+import HTML from 'react-native-render-html';
 //import 'moment/locale/th';
 //moment.locale('th');
 
@@ -80,7 +81,8 @@ export default class MessageObjectDetail extends Component {
             <Image source={{uri:this.state.object_data.image_past}} style={{height: 184,width: '100%'}} resizeMode={'contain'}/>
           </View>
           <View style={{marginTop:10,padding:16,borderRadius:5,backgroundColor:'white'}}>
-            <Text style={styles.textTitle}>{this.state.object_data.parcel_name}</Text>
+            <HTML html={this.state.object_data.parcel_name} baseFontStyle={{fontFamily: 'Prompt-Regular', color: '#269A21'}} />
+            {/* <Text style={styles.textTitle}>{this.state.object_data.parcel_name}</Text> */}
             <View style={{alignItems:'center',flexDirection:'row'}}>
               <Text style={styles.textGray}>{t('status')}</Text>
               <View style={{marginHorizontal:10,height: 10,width: 10,borderRadius:5,backgroundColor:this.statusColor(this.state.object_data.status)}}/>
diff --git a/src/screens/redeem/ScanCoupon.js b/src/screens/redeem/ScanCoupon.js
index dfd28ca..11884fa 100644
--- a/src/screens/redeem/ScanCoupon.js
+++ b/src/screens/redeem/ScanCoupon.js
@@ -27,21 +27,21 @@ class ScanCoupon extends Component {
     })
 
     this.props.navigation.setParams({index: 2})
-    // usedCoupon(reward_id).then(res => {
-    //   if(res.data && res.data.success) {
+    usedCoupon(reward_id).then(res => {
+      if(res.data && res.data.success) {
         
-    //   }else {
-    //     let message = res.data?.message || ''
-    //     Alert.alert('Unsuccessfully', message, [
-    //       {
-    //         text: 'ok',
-    //         onPress: () => {
-    //           this.props.navigation.navigate('RewardDetail', {id: reward_id.id, is_my_reward: true, is_history: false})
-    //         }
-    //       }
-    //     ])
-    //   }
-    // })
+      }else {
+        let message = res.data?.message || ''
+        Alert.alert('Unsuccessfully', message, [
+          {
+            text: 'ok',
+            onPress: () => {
+              this.props.navigation.navigate('RewardDetail', {id: reward_id.id, is_my_reward: true, is_history: false})
+            }
+          }
+        ])
+      }
+    })
   }
 
   componentWillMount(){
diff --git a/src/screens/repair/RepairIndex.js b/src/screens/repair/RepairIndex.js
index b14d790..1addbc9 100644
--- a/src/screens/repair/RepairIndex.js
+++ b/src/screens/repair/RepairIndex.js
@@ -274,8 +274,11 @@ class RepairIndex extends Component {
   }
 
   handleDatePicked = (e, date) => {
-    this.setState({ visibleDate: false })
-    if(e.type === 'set' && date) {
+    if(Platform.OS === 'android') {
+      this.setState({ visibleDate: false })
+    }
+
+    if((Platform.OS === 'android' && e.type === 'set' && date) || (Platform.OS === 'ios' && date)) {
       this.setState({
         select_date: date
       })
@@ -478,7 +481,9 @@ class RepairIndex extends Component {
         {
           this.state.visibleDate && 
             <View>
-              {/* <View style={Styles.BtnDatePicker}>
+              {
+                Platform.OS === 'ios' &&
+                <View style={Styles.BtnDatePicker}>
                 <Button
                   title={t('ok')}
                   color="white"
@@ -497,7 +502,9 @@ class RepairIndex extends Component {
                     });
                   }}
                 />
-              </View> */}
+              </View>
+              }
+              
               <RNDateTimePicker
                 value={this.state.select_date}
                 onChange={this.handleDatePicked}
diff --git a/src/screens/service/MoveOutScreen.js b/src/screens/service/MoveOutScreen.js
index 9122b71..c614e19 100644
--- a/src/screens/service/MoveOutScreen.js
+++ b/src/screens/service/MoveOutScreen.js
@@ -127,8 +127,11 @@ class MoveOutScreen extends Component {
   }
 
   handleDatePicked = (e, date) => {
-    this.setState({ isDateTimePickerVisible: false })
-    if(e.type === 'set' && date) {
+    if(Platform.OS === 'android') {
+      this.setState({ isDateTimePickerVisible: false })
+    }
+    
+    if((Platform.OS === 'android' && e.type === 'set' && date) || (Platform.OS === 'ios' && date)) {
       this.setState({
         select_date: date,
         data: {
@@ -259,7 +262,9 @@ class MoveOutScreen extends Component {
         {
           this.state.isDateTimePickerVisible &&
             <View>
-              {/* <View style={Styles.BtnDatePicker}>
+              {
+                Platform.OS === 'ios' &&
+                <View style={Styles.BtnDatePicker}>
                 <Button
                   title={t('ok')}
                   color="white"
@@ -278,7 +283,9 @@ class MoveOutScreen extends Component {
                     });
                   }}
                 />
-              </View> */}
+              </View>
+              }
+              
               <RNDateTimePicker
                 value={this.state.select_date}
                 onChange={this.handleDatePicked}
diff --git a/yarn.lock b/yarn.lock
index 83b89b7..0f75439 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1088,7 +1088,20 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3", "@babel/traverse@^7.20.0", "@babel/traverse@^7.25.3", "@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.28.0":
+"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
+  integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.0"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.0"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.0"
+    debug "^4.3.1"
+
+"@babel/traverse@^7.20.0", "@babel/traverse@^7.25.3", "@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.28.0":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
   integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
@@ -1959,11 +1972,11 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.7.tgz#968cdc2366ec3da159f61166428ee40f370e56c2"
-  integrity sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.28.0.tgz#07d713d6cce0d265c9849db0cbe62d3f61f36f74"
+  integrity sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==
   dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.28.2"
 
 "@types/graceful-fs@^4.1.3":
   version "4.1.9"
@@ -2009,11 +2022,11 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/node@*":
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.1.0.tgz#0993f7dc31ab5cc402d112315b463e383d68a49c"
-  integrity sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==
+  version "24.2.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.2.0.tgz#cde712f88c5190006d6b069232582ecd1f94a760"
+  integrity sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==
   dependencies:
-    undici-types "~7.8.0"
+    undici-types "~7.10.0"
 
 "@types/prop-types@*":
   version "15.7.15"
@@ -3065,9 +3078,9 @@ convert-source-map@^2.0.0:
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
 core-js-compat@^3.43.0:
-  version "3.44.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.44.0.tgz#62b9165b97e4cbdb8bca16b14818e67428b4a0f8"
-  integrity sha512-JepmAj2zfl6ogy34qfWtcE7nHKAJnKsQFRn++scjVS2bZFllwptzw61BZcZFYBPpUznLfAvh0LGhxKppk04ClA==
+  version "3.45.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.45.0.tgz#bc0017525dcb7a42ba3241d02f6fce9bae8e5c33"
+  integrity sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==
   dependencies:
     browserslist "^4.25.1"
 
@@ -3400,9 +3413,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.173:
-  version "1.5.192"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.192.tgz#6dfc57a41846a57b18f9c0121821a6df1e165cc1"
-  integrity sha512-rP8Ez0w7UNw/9j5eSXCe10o1g/8B1P5SM90PCCMVkIRQn2R0LEHWz4Eh9RnxkniuDe1W0cTSOB3MLlkTGDcuCg==
+  version "1.5.195"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.195.tgz#2fe0d9b644726292189f227be73740868617b6d5"
+  integrity sha512-URclP0iIaDUzqcAyV1v2PgduJ9N0IdXmWsnPzPfelvBmjmZzEy6xJcjb1cXj+TbYqXgtLrjHEoaSIdTYhw4ezg==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -4064,9 +4077,9 @@ flow-enums-runtime@^0.0.6:
   integrity sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw==
 
 flow-parser@0.*:
-  version "0.277.1"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.277.1.tgz#306a49125702fa272ee47d8940905d2ee603ced1"
-  integrity sha512-86F5PGl+OrFvCzyK04id9Yf9rxFB8485GPs5sexB4cVLOXmpHbSi1/dYiaemI53I85CpImBu/qHVmZnGQflgmw==
+  version "0.278.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.278.0.tgz#fa7ccc16ff249f07804808455a365ec2e098222f"
+  integrity sha512-9oUcYDHf9n+E/t0FXndgBqGbaUsGEcmWqIr1ldqCzTzctsJV5E/bHusOj4ThB72Ss2mqWpLFNz0+o2c1O8J6+A==
 
 flow-parser@^0.206.0:
   version "0.206.0"
@@ -4074,9 +4087,9 @@ flow-parser@^0.206.0:
   integrity sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w==
 
 follow-redirects@^1.14.0:
-  version "1.15.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
-  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
+  version "1.15.11"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
+  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
 
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
@@ -8857,9 +8870,9 @@ typed-array-length@^1.0.7:
     reflect.getprototypeof "^1.0.6"
 
 typescript@^5.8.3:
-  version "5.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
-  integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
+  version "5.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
+  integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
 
 ua-parser-js@^0.7.30:
   version "0.7.40"
@@ -8894,10 +8907,10 @@ unbox-primitive@^1.1.0:
     has-symbols "^1.1.0"
     which-boxed-primitive "^1.1.1"
 
-undici-types@~7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"
-  integrity sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==
+undici-types@~7.10.0:
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.10.0.tgz#4ac2e058ce56b462b056e629cc6a02393d3ff350"
+  integrity sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.1"