init project for hotfix/update-sdk-33 branch

android/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>csareactrn60</name>
+	<name>charoensin-android</name>
 	<comment>Project android created by Buildship.</comment>
 	<projects>
 	</projects>

android/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,13 @@
+arguments=--init-script /var/folders/4d/cv31_tl15q381gddgqqtk94c0000gp/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/4d/cv31_tl15q381gddgqqtk94c0000gp/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=true
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

android/app/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

android/app/build.gradle

@@ -131,10 +131,10 @@ android {
         applicationId "th.co.csasset.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 85
+        versionCode 100
-        versionName "2.34"
+        versionName "2.41"
         vectorDrawables.useSupportLibrary = true
-    }
+    }   
     splits {
         abi {
             reset()
@@ -211,6 +211,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'com.facebook.soloader:soloader:0.10.4+'
     if (enableHermes) {
       def hermesPath = "../../node_modules/hermesvm/android/";
       debugImplementation files(hermesPath + "hermes-debug.aar")

android/app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":85,"versionName":"2.34","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="th.co.csasset.mobile">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="th.co.csasset.mobile">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-feature android:name="android.hardware.camera.front" android:required="false" />
 
@@ -22,23 +27,26 @@
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+          android:exported="true">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-      <service android:name="io.invertase.firebase.messaging.RNFirebaseMessagingService">
+      <!-- <service android:name="io.invertase.firebase.messaging.RNFirebaseMessagingService"
+          android:exported="true">
           <intent-filter>
               <action android:name="com.google.firebase.MESSAGING_EVENT"/>
           </intent-filter>
       </service>
-      <service android:name="io.invertase.firebase.messaging.RNFirebaseInstanceIdService">
+      <service android:name="io.invertase.firebase.messaging.RNFirebaseInstanceIdService"
+          android:exported="true">
           <intent-filter>
               <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
           </intent-filter>
-      </service>
+      </service> -->
       <meta-data android:name="com.facebook.sdk.ApplicationId" 
         android:value="@string/facebook_app_id"/>
       <activity android:name="com.facebook.FacebookActivity"

android/build.gradle

@@ -6,8 +6,8 @@ buildscript {
         buildToolsVersion = "28.0.3"
         minSdkVersion = 21
         kotlinVersion = "1.3.72"
-        compileSdkVersion = 30
+        compileSdkVersion = 33
-        targetSdkVersion = 30
+        targetSdkVersion = 34
     }
     repositories {
         google()
@@ -15,8 +15,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.1")
+        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle.properties

@@ -18,3 +18,4 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
 android.enableJetifier=true
 MYAPP_RELEASE_STORE_PASSWORD=aabbccddee
+android.newArchEnabled=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Nov 01 15:44:40 ICT 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

@@ -3,6 +3,8 @@ include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+include ':react-native-webview'
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-device-info'
 project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-fbsdk'

ios/Podfile

@@ -28,7 +28,7 @@ target 'csareactrn60' do
   pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
   pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
   pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
+  pod 'React-callinvoker', :path => "../node_modules/react-native/ReactCommon/callinvoker"
   pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
   pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
 
@@ -44,10 +44,15 @@ target 'csareactrn60' do
   pod 'FBSDKShareKit'
 
   # Required by RNFirebase
-    pod 'RNFirebase', :path => '../node_modules/react-native-firebase/ios'
+    # pod 'RNFirebase', :path => '../node_modules/react-native-firebase/ios'
-    pod 'Firebase/Core', '~> 6.13.0'
+    # pod 'Firebase/Core', '~> 6.13.0'
-    pod 'Firebase/Messaging', '~> 6.13.0'
+    # pod 'Firebase/Messaging', '~> 6.13.0'
-    pod 'Firebase/RemoteConfig', '~> 6.13.0'
+    # pod 'Firebase/RemoteConfig', '~> 6.13.0'
+
+  pod 'Firebase', :modular_headers => true
+  pod 'FirebaseCoreInternal', :modular_headers => true
+  pod 'FirebaseCore', :modular_headers => true
+  pod 'GoogleUtilities', :modular_headers => true
 
   pod 'react-native-view-shot', :path => '../node_modules/react-native-view-shot'
   pod 'RNImageCropPicker', :path =>  '../node_modules/react-native-image-crop-picker'

ios/Podfile.lock

@@ -0,0 +1,687 @@
+PODS:
+  - boost-for-react-native (1.63.0)
+  - BVLinearGradient (2.6.2):
+    - React-Core
+  - DoubleConversion (1.1.6)
+  - FBLazyVector (0.63.4)
+  - FBReactNativeSpec (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.63.4)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - FBSDKCoreKit (5.8.0):
+    - FBSDKCoreKit/Basics (= 5.8.0)
+    - FBSDKCoreKit/Core (= 5.8.0)
+  - FBSDKCoreKit/Basics (5.8.0)
+  - FBSDKCoreKit/Core (5.8.0):
+    - FBSDKCoreKit/Basics
+  - FBSDKLoginKit (5.8.0):
+    - FBSDKLoginKit/Login (= 5.8.0)
+  - FBSDKLoginKit/Login (5.8.0):
+    - FBSDKCoreKit (~> 5.0)
+  - FBSDKShareKit (5.8.0):
+    - FBSDKShareKit/Share (= 5.8.0)
+  - FBSDKShareKit/Share (5.8.0):
+    - FBSDKCoreKit (~> 5.0)
+  - Firebase (10.6.0):
+    - Firebase/Core (= 10.6.0)
+  - Firebase/Core (10.6.0):
+    - Firebase/CoreOnly
+    - FirebaseAnalytics (~> 10.6.0)
+  - Firebase/CoreOnly (10.6.0):
+    - FirebaseCore (= 10.6.0)
+  - Firebase/Messaging (10.6.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 10.6.0)
+  - FirebaseAnalytics (10.6.0):
+    - FirebaseAnalytics/AdIdSupport (= 10.6.0)
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/MethodSwizzler (~> 7.8)
+    - GoogleUtilities/Network (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - FirebaseAnalytics/AdIdSupport (10.6.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleAppMeasurement (= 10.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/MethodSwizzler (~> 7.8)
+    - GoogleUtilities/Network (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - FirebaseCore (10.6.0):
+    - FirebaseCoreInternal (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Logger (~> 7.8)
+  - FirebaseCoreExtension (10.6.0):
+    - FirebaseCore (~> 10.0)
+  - FirebaseCoreInternal (10.21.0):
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+  - FirebaseInstallations (10.21.0):
+    - FirebaseCore (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - PromisesObjC (~> 2.1)
+  - FirebaseMessaging (10.6.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Reachability (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - Folly (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - Folly/Default (= 2020.01.13.00)
+    - glog
+  - Folly/Default (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+  - glog (0.3.5)
+  - GoogleAppMeasurement (10.6.0):
+    - GoogleAppMeasurement/AdIdSupport (= 10.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/MethodSwizzler (~> 7.8)
+    - GoogleUtilities/Network (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - GoogleAppMeasurement/AdIdSupport (10.6.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/MethodSwizzler (~> 7.8)
+    - GoogleUtilities/Network (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - GoogleAppMeasurement/WithoutAdIdSupport (10.6.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/MethodSwizzler (~> 7.8)
+    - GoogleUtilities/Network (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - GoogleDataTransport (9.3.0):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities (7.12.0):
+    - GoogleUtilities/AppDelegateSwizzler (= 7.12.0)
+    - GoogleUtilities/Environment (= 7.12.0)
+    - GoogleUtilities/ISASwizzler (= 7.12.0)
+    - GoogleUtilities/Logger (= 7.12.0)
+    - GoogleUtilities/MethodSwizzler (= 7.12.0)
+    - GoogleUtilities/Network (= 7.12.0)
+    - "GoogleUtilities/NSData+zlib (= 7.12.0)"
+    - GoogleUtilities/Reachability (= 7.12.0)
+    - GoogleUtilities/SwizzlerTestHelpers (= 7.12.0)
+    - GoogleUtilities/UserDefaults (= 7.12.0)
+  - GoogleUtilities/AppDelegateSwizzler (7.12.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (7.12.0):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/ISASwizzler (7.12.0)
+  - GoogleUtilities/Logger (7.12.0):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/MethodSwizzler (7.12.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/Network (7.12.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (7.12.0)"
+  - GoogleUtilities/Reachability (7.12.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/SwizzlerTestHelpers (7.12.0):
+    - GoogleUtilities/MethodSwizzler
+  - GoogleUtilities/UserDefaults (7.12.0):
+    - GoogleUtilities/Logger
+  - libwebp (1.3.2):
+    - libwebp/demux (= 1.3.2)
+    - libwebp/mux (= 1.3.2)
+    - libwebp/sharpyuv (= 1.3.2)
+    - libwebp/webp (= 1.3.2)
+  - libwebp/demux (1.3.2):
+    - libwebp/webp
+  - libwebp/mux (1.3.2):
+    - libwebp/demux
+  - libwebp/sharpyuv (1.3.2)
+  - libwebp/webp (1.3.2):
+    - libwebp/sharpyuv
+  - nanopb (2.30909.1):
+    - nanopb/decode (= 2.30909.1)
+    - nanopb/encode (= 2.30909.1)
+  - nanopb/decode (2.30909.1)
+  - nanopb/encode (2.30909.1)
+  - PromisesObjC (2.3.1)
+  - RCTRequired (0.63.4)
+  - RCTTypeSafety (0.63.4):
+    - FBLazyVector (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.63.4)
+    - React-Core (= 0.63.4)
+  - React (0.63.4):
+    - React-Core (= 0.63.4)
+    - React-Core/DevSupport (= 0.63.4)
+    - React-Core/RCTWebSocket (= 0.63.4)
+    - React-RCTActionSheet (= 0.63.4)
+    - React-RCTAnimation (= 0.63.4)
+    - React-RCTBlob (= 0.63.4)
+    - React-RCTImage (= 0.63.4)
+    - React-RCTLinking (= 0.63.4)
+    - React-RCTNetwork (= 0.63.4)
+    - React-RCTSettings (= 0.63.4)
+    - React-RCTText (= 0.63.4)
+    - React-RCTVibration (= 0.63.4)
+  - React-callinvoker (0.63.4)
+  - React-Core (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/CoreModulesHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/Default (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/DevSupport (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default (= 0.63.4)
+    - React-Core/RCTWebSocket (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - React-jsinspector (= 0.63.4)
+    - Yoga
+  - React-Core/RCTActionSheetHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTAnimationHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTBlobHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTImageHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTLinkingHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTNetworkHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTSettingsHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTTextHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTVibrationHeaders (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-Core/RCTWebSocket (0.63.4):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - Yoga
+  - React-CoreModules (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/CoreModulesHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-RCTImage (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-cxxreact (0.63.4):
+    - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-callinvoker (= 0.63.4)
+    - React-jsinspector (= 0.63.4)
+  - React-jsi (0.63.4):
+    - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-jsi/Default (= 0.63.4)
+  - React-jsi/Default (0.63.4):
+    - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
+    - Folly (= 2020.01.13.00)
+    - glog
+  - React-jsiexecutor (0.63.4):
+    - DoubleConversion
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+  - React-jsinspector (0.63.4)
+  - react-native-cameraroll (1.8.1):
+    - React
+  - react-native-fbsdk (1.1.2):
+    - React
+    - react-native-fbsdk/Core (= 1.1.2)
+    - react-native-fbsdk/Login (= 1.1.2)
+    - react-native-fbsdk/Share (= 1.1.2)
+  - react-native-fbsdk/Core (1.1.2):
+    - FBSDKCoreKit (= 5.8)
+    - React
+  - react-native-fbsdk/Login (1.1.2):
+    - FBSDKLoginKit (= 5.8)
+    - React
+  - react-native-fbsdk/Share (1.1.2):
+    - FBSDKShareKit (= 5.8)
+    - React
+  - react-native-splash-screen (3.3.0):
+    - React-Core
+  - react-native-view-shot (3.4.0):
+    - React-Core
+  - react-native-webview (11.23.0):
+    - React-Core
+  - React-RCTActionSheet (0.63.4):
+    - React-Core/RCTActionSheetHeaders (= 0.63.4)
+  - React-RCTAnimation (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTAnimationHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTBlob (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - React-Core/RCTBlobHeaders (= 0.63.4)
+    - React-Core/RCTWebSocket (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-RCTNetwork (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTImage (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTImageHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-RCTNetwork (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTLinking (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - React-Core/RCTLinkingHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTNetwork (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTNetworkHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTSettings (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTSettingsHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTText (0.63.4):
+    - React-Core/RCTTextHeaders (= 0.63.4)
+  - React-RCTVibration (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - Folly (= 2020.01.13.00)
+    - React-Core/RCTVibrationHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - ReactCommon/turbomodule/core (0.63.4):
+    - DoubleConversion
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-callinvoker (= 0.63.4)
+    - React-Core (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+  - RNAppleAuthentication (1.1.2):
+    - React
+  - RNDeviceInfo (5.6.5):
+    - React
+  - RNFastImage (8.6.0):
+    - React-Core
+    - SDWebImage (~> 5.11.1)
+    - SDWebImageWebPCoder (~> 0.8.4)
+  - RNFBApp (17.3.2):
+    - Firebase/CoreOnly (= 10.6.0)
+    - React-Core
+  - RNFBMessaging (17.3.2):
+    - Firebase/Messaging (= 10.6.0)
+    - FirebaseCoreExtension (= 10.6.0)
+    - React-Core
+    - RNFBApp
+  - RNGestureHandler (1.10.3):
+    - React-Core
+  - RNImageCropPicker (0.32.3):
+    - React-Core
+    - React-RCTImage
+    - RNImageCropPicker/QBImagePickerController (= 0.32.3)
+    - TOCropViewController
+  - RNImageCropPicker/QBImagePickerController (0.32.3):
+    - React-Core
+    - React-RCTImage
+    - TOCropViewController
+  - RNScreens (2.18.1):
+    - React-Core
+  - RNSVG (9.13.6):
+    - React
+  - RNVectorIcons (6.7.0):
+    - React
+  - SDWebImage (5.11.1):
+    - SDWebImage/Core (= 5.11.1)
+  - SDWebImage/Core (5.11.1)
+  - SDWebImageWebPCoder (0.8.5):
+    - libwebp (~> 1.0)
+    - SDWebImage/Core (~> 5.10)
+  - TOCropViewController (2.6.1)
+  - toolbar-android (0.2.1):
+    - React
+  - Yoga (1.14.0)
+
+DEPENDENCIES:
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
+  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
+  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
+  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
+  - FBSDKCoreKit
+  - FBSDKLoginKit
+  - FBSDKShareKit
+  - Firebase
+  - FirebaseCore
+  - FirebaseCoreInternal
+  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
+  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - GoogleUtilities
+  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
+  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
+  - React (from `../node_modules/react-native/`)
+  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
+  - React-Core (from `../node_modules/react-native/`)
+  - React-Core/DevSupport (from `../node_modules/react-native/`)
+  - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
+  - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
+  - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
+  - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
+  - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
+  - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+  - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
+  - react-native-fbsdk (from `../node_modules/react-native-fbsdk`)
+  - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
+  - react-native-view-shot (from `../node_modules/react-native-view-shot`)
+  - react-native-webview (from `../node_modules/react-native-webview`)
+  - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
+  - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
+  - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
+  - React-RCTImage (from `../node_modules/react-native/Libraries/Image`)
+  - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`)
+  - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`)
+  - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
+  - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
+  - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
+  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - "RNAppleAuthentication (from `../node_modules/@invertase/react-native-apple-authentication`)"
+  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
+  - RNFastImage (from `../node_modules/react-native-fast-image`)
+  - "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
+  - "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)"
+  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
+  - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
+  - RNScreens (from `../node_modules/react-native-screens`)
+  - RNSVG (from `../node_modules/react-native-svg`)
+  - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
+  - "toolbar-android (from `../node_modules/@react-native-community/toolbar-android`)"
+  - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
+
+SPEC REPOS:
+  trunk:
+    - boost-for-react-native
+    - FBSDKCoreKit
+    - FBSDKLoginKit
+    - FBSDKShareKit
+    - Firebase
+    - FirebaseAnalytics
+    - FirebaseCore
+    - FirebaseCoreExtension
+    - FirebaseCoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
+    - GoogleAppMeasurement
+    - GoogleDataTransport
+    - GoogleUtilities
+    - libwebp
+    - nanopb
+    - PromisesObjC
+    - SDWebImage
+    - SDWebImageWebPCoder
+    - TOCropViewController
+
+EXTERNAL SOURCES:
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
+  DoubleConversion:
+    :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
+  FBLazyVector:
+    :path: "../node_modules/react-native/Libraries/FBLazyVector"
+  FBReactNativeSpec:
+    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
+  Folly:
+    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
+  glog:
+    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
+  RCTRequired:
+    :path: "../node_modules/react-native/Libraries/RCTRequired"
+  RCTTypeSafety:
+    :path: "../node_modules/react-native/Libraries/TypeSafety"
+  React:
+    :path: "../node_modules/react-native/"
+  React-callinvoker:
+    :path: "../node_modules/react-native/ReactCommon/callinvoker"
+  React-Core:
+    :path: "../node_modules/react-native/"
+  React-CoreModules:
+    :path: "../node_modules/react-native/React/CoreModules"
+  React-cxxreact:
+    :path: "../node_modules/react-native/ReactCommon/cxxreact"
+  React-jsi:
+    :path: "../node_modules/react-native/ReactCommon/jsi"
+  React-jsiexecutor:
+    :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
+  React-jsinspector:
+    :path: "../node_modules/react-native/ReactCommon/jsinspector"
+  react-native-cameraroll:
+    :path: "../node_modules/@react-native-community/cameraroll"
+  react-native-fbsdk:
+    :path: "../node_modules/react-native-fbsdk"
+  react-native-splash-screen:
+    :path: "../node_modules/react-native-splash-screen"
+  react-native-view-shot:
+    :path: "../node_modules/react-native-view-shot"
+  react-native-webview:
+    :path: "../node_modules/react-native-webview"
+  React-RCTActionSheet:
+    :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
+  React-RCTAnimation:
+    :path: "../node_modules/react-native/Libraries/NativeAnimation"
+  React-RCTBlob:
+    :path: "../node_modules/react-native/Libraries/Blob"
+  React-RCTImage:
+    :path: "../node_modules/react-native/Libraries/Image"
+  React-RCTLinking:
+    :path: "../node_modules/react-native/Libraries/LinkingIOS"
+  React-RCTNetwork:
+    :path: "../node_modules/react-native/Libraries/Network"
+  React-RCTSettings:
+    :path: "../node_modules/react-native/Libraries/Settings"
+  React-RCTText:
+    :path: "../node_modules/react-native/Libraries/Text"
+  React-RCTVibration:
+    :path: "../node_modules/react-native/Libraries/Vibration"
+  ReactCommon:
+    :path: "../node_modules/react-native/ReactCommon"
+  RNAppleAuthentication:
+    :path: "../node_modules/@invertase/react-native-apple-authentication"
+  RNDeviceInfo:
+    :path: "../node_modules/react-native-device-info"
+  RNFastImage:
+    :path: "../node_modules/react-native-fast-image"
+  RNFBApp:
+    :path: "../node_modules/@react-native-firebase/app"
+  RNFBMessaging:
+    :path: "../node_modules/@react-native-firebase/messaging"
+  RNGestureHandler:
+    :path: "../node_modules/react-native-gesture-handler"
+  RNImageCropPicker:
+    :path: "../node_modules/react-native-image-crop-picker"
+  RNScreens:
+    :path: "../node_modules/react-native-screens"
+  RNSVG:
+    :path: "../node_modules/react-native-svg"
+  RNVectorIcons:
+    :path: "../node_modules/react-native-vector-icons"
+  toolbar-android:
+    :path: "../node_modules/@react-native-community/toolbar-android"
+  Yoga:
+    :path: "../node_modules/react-native/ReactCommon/yoga"
+
+SPEC CHECKSUMS:
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
+  FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
+  FBSDKCoreKit: e7dcac0aabcfb09d0166998edd95fe3b05a0ce5d
+  FBSDKLoginKit: 1b0cf04df0370b37404213157b060d6666ede814
+  FBSDKShareKit: abc29e1bb4f9f59f679adf1ae191006d68455f96
+  Firebase: f13680471b021937f2230ea8503c7809d8c29806
+  FirebaseAnalytics: 9f382605c5ee412b039212f054bf7a403d9850c1
+  FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4
+  FirebaseCoreExtension: 318e5ee9ad4092b00423c2bddd51c3f5c3585973
+  FirebaseCoreInternal: 43c1788eaeee9d1b97caaa751af567ce11010d00
+  FirebaseInstallations: 390ea1d10a4d02b20c965cbfd527ee9b3b412acb
+  FirebaseMessaging: fd93783258c53ae5cdb9b41bf0c51606a677f2d5
+  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
+  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  GoogleAppMeasurement: 686b48c3c895f3c55c70719041913d5d150b74f6
+  GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
+  GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+  nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
+  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
+  RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
+  React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
+  React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe
+  React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b
+  React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60
+  React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3
+  React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
+  React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
+  React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
+  react-native-cameraroll: e2917a5e62da9f10c3d525e157e25e694d2d6dfa
+  react-native-fbsdk: c35d42169e64aaf66f01713c1e18d0674f7f6519
+  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
+  react-native-view-shot: a60a98a18c72bcaaaf2138f9aab960ae9b0d96c7
+  react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336
+  React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
+  React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
+  React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
+  React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0
+  React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2
+  React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae
+  React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a
+  React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
+  React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
+  ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
+  RNAppleAuthentication: 473b2c076f1a48a537610580a168c1fb6d0a90c6
+  RNDeviceInfo: c5f8f3a456adcbba405ace475254b08febc4c095
+  RNFastImage: 72a2d5802adef70f8e42fce486f78878f8b47dae
+  RNFBApp: 3bf62629c41ef65d82e763c25aeb77cdfa63bfae
+  RNFBMessaging: c2bf85653cdb745f60d3cc43c9ec51d4edca0c52
+  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
+  RNImageCropPicker: 54e5ea3d0e298ed51e1441a2fa0a0e7c90ee256d
+  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
+  RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
+  RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d
+  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
+  SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
+  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
+  toolbar-android: 2a73856e98b750d7e71ce4644d3f41cc98211719
+  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
+
+PODFILE CHECKSUM: 32319a64411dce4ba1e64a703ce66a093746e5af
+
+COCOAPODS: 1.15.2

ios/PrivacyInfo.xcprivacy

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+   PrivacyInfo.xcprivacy
+   csareactrn60
+
+   Created by Kumpor on 12/3/2568 BE.
+   Copyright (c) 2568 BE Facebook. All rights reserved.
+-->
+<plist version="1.0">
+<dict/>
+</plist>

package.json

@@ -9,9 +9,9 @@
     "postinstall": "sh ./fix.sh",
     "prod-android": "cd android && ./gradlew assembleRelease",
     "run-android": "react-native run-android",
-    "run-ios": "react-native run-ios --simulator \"iPhone 11\"",
+    "run-ios": "react-native run-ios --simulator \"iPhone 14 Pro Max\"",
     "run-device": "react-native run-ios --device",
-    "ios": "react-native run-ios"
+    "ios": "react-native run-ios --simulator \"iPhone 14 Pro Max\""
   },
   "rnpm": {
     "assets": [
@@ -22,6 +22,7 @@
   "dependencies": {
     "@invertase/react-native-apple-authentication": "^1.1.2",
     "@react-native-community/cameraroll": "^1.2.1",
+    "@react-native-community/picker": "^1.8.1",
     "@react-native-community/toolbar-android": "0.2.1",
     "@react-native-firebase/app": "^17.3.2",
     "@react-native-firebase/messaging": "^17.3.2",
@@ -33,7 +34,7 @@
     "moment": "^2.24.0",
     "native-base": "^2.13.8",
     "react": "16.9.0",
-    "react-native": "0.63",
+    "react-native": "^0.63",
     "react-native-action-sheet": "^2.2.0",
     "react-native-device-info": "^5.5.7",
     "react-native-easy-grid": "^0.2.2",
@@ -43,7 +44,7 @@
     "react-native-fbsdk": "^1.1.2",
     "react-native-gesture-handler": "^1.4.1",
     "react-native-hyperlink": "^0.0.16",
-    "react-native-image-crop-picker": "^0.32.2",
+    "react-native-image-crop-picker": "0.40.0",
     "react-native-image-slider-show": "^1.0.3",
     "react-native-image-slideshow": "^1.0.1",
     "react-native-image-view": "^2.1.5",
@@ -63,7 +64,7 @@
     "react-native-switch-toggle": "^1.1.0",
     "react-native-vector-icons": "^6.6.0",
     "react-native-view-shot": "^3.0.2",
-    "react-native-webview": "10.0.0",
+    "react-native-webview": "11.23.1",
     "react-navigation": "^3.3.0",
     "react-redux": "^7.1.1",
     "redux": "^4.0.4",

src/api/UserApi.js

@@ -83,9 +83,11 @@ export const roomdetail = (room_id) => {
   });
 }
 
-export const payment = (user_id) => {
+export const payment = (user_id, page, search='') => {
     return Api.get('/payment', {
-        user_id: user_id
+        user_id,
+        page,
+        search
     });
 }
 
@@ -281,3 +283,7 @@ export function postEvaluateRepair(params) {
 export function setLanguage(language) {
   return Api.post('/me/set_language', {language: language})
 }
+
+export function requestDeleteAccount() {
+  return Api.get('/me/request_delete')
+}

src/navigation/AppStack.js

@@ -56,7 +56,7 @@ const NavWithRightIcon = (title, iconName, routeName) => ({ navigation }) => ({
   title: t(title),
   headerStyle: {
     backgroundColor: '#00420A',
-    height: 50,
+    height: 75,
     elevation: 0,
     shadowOpacity: 0,
   },
@@ -100,7 +100,7 @@ const defaultNavOption = (title, backgroundColor) => ({ navigation }) => ({
   title: t(title),
   headerStyle: {
     backgroundColor: backgroundColor || '#00420A',
-    height: 50,
+    height: 75,
     elevation: 0,
     shadowOpacity: 0,
   },
@@ -393,7 +393,7 @@ const AppStack = createStackNavigator({
         // title: 'Charoensin Condo',
         headerStyle: {
           backgroundColor: '#00420A',
-          height: 50,
+          height: 75,
           elevation: 0,
           shadowOpacity: 0,
         },
@@ -450,7 +450,7 @@ const AppStack = createStackNavigator({
       title: '',
       headerStyle: {
         backgroundColor: '#00420A',
-        height: 50,
+        height: 75,
         elevation: 0,
         shadowOpacity: 0,
       },
@@ -542,7 +542,7 @@ const AppStack = createStackNavigator({
       title: t('mail_and_parcel'),
       headerStyle: {
         backgroundColor: '#00420A',
-        height: 50,
+        height: 75,
         elevation: 0,
         shadowOpacity: 0,
       },
@@ -571,7 +571,7 @@ const AppStack = createStackNavigator({
       headerLeft: (
         <TouchableOpacity
           style={{ width: '100%', height: '100%', alignItems: 'center', justifyContent: 'center', }}
-          onPress={() => navigation.navigate('HomeScreen')}>
+          onPress={() => navigation.goBack()}>
           <Icon name="ic_back" size={20} color="#fff"/>
         </TouchableOpacity>
       )
@@ -625,7 +625,7 @@ const AppStack = createStackNavigator({
       title: t('repair_history_detail'),
       headerStyle: {
         backgroundColor: '#00420A',
-        height: 50,
+        height: 75,
         elevation: 0,
         shadowOpacity: 0,
       },
@@ -676,7 +676,7 @@ const AppStack = createStackNavigator({
       title: t('term_condition'),
       headerStyle: {
         backgroundColor: '#00420A',
-        height: 50,
+        height: 75,
         elevation: 0,
         shadowOpacity: 0,
       },

src/screens/bill/Bill.js

@@ -1,4 +1,5 @@
 import React, { Component } from 'react'
+import IconAntDesign from 'react-native-vector-icons/AntDesign'
 import Icon from '../../components/Icon'
 import {
   Accordion,
@@ -26,6 +27,8 @@ import IndicatorLoading from '../../components/IndicatorLoading';
 import { t } from 'src/utils/i18n'
 import parseDateLocale from 'src/utils/parseDateLocale';
 const { height, width } = Dimensions.get('window')
+import { CustomInput } from '../../components/CustomInput'
+import debounce from 'lodash/debounce'
 
 function ItemOrder({title,cost,description,type}){
 
@@ -91,17 +94,41 @@ class BillScreen extends Component {
       isCanPay: true,
       all_payment : [],
       room_number_array : [],
+      page: 1,
+      total_page: 1,
+      currentIndex: 0,
+      search: ''
     };
 
     this._onCarouselScroll = this._onCarouselScroll.bind(this)
     this.checkDueDate = this.checkDueDate.bind(this)
     this.checkstatusBill = this.checkstatusBill.bind(this)
+    this.debounceSearch = debounce(() => {
+      this.setState({
+        page: 1,
+        all_payment : [],
+        room_number_array : [],
+        payment: [],
+        sum_payment: [],
+        total_page: 1,
+        currentIndex: 0
+      }, () => {
+        this.getPaymentPagination()
+      })
+    }, 2500)
   }
 
   componentDidMount() {
-    this.setState({isLoading: true})
     if(this.props.user){
-        payment(this.props.user.id)
+        this.getPaymentPagination()
+    }
+  }
+
+  getPaymentPagination () {
+    this.setState({
+       isLoading: true
+    }, () => {
+      payment(this.props.user.id, this.state.page, this.state.search)
         .then(res => {
           if(res.ok){
             let sum_payment = [];
@@ -119,6 +146,7 @@ class BillScreen extends Component {
               })
             }
 
+            sum_payment = this.state.sum_payment.concat(sum_payment)
             let payment = res.data.payment_room_period
             if(Object.keys(payment).length > 0){
               Object.keys(payment).map((pay) => {
@@ -128,19 +156,15 @@ class BillScreen extends Component {
                     array_payment.push({
                       room_id: pay,
                       period: detail,
-                      // total_cost: payment[pay][detail].total_cost,
-                      // details: payment[pay][detail].details,
-                      // status: payment[pay][detail].status,
-                      // created_at: payment[pay][detail].created_at,
-                      // payment_id: payment[pay][detail].id,
-                      // enable_qr: payment[pay][detail].enable_qr
                       ...payment[pay][detail]
                     })
                   })
                 }
               })
             }
-            let all_payment_data = array_payment;
+
+            let all_payment_data = this.state.all_payment.concat(array_payment)
+
             let array_room_no = this.state.room_number_array;
             this.setState({
               room_number_array: array_room_no.filter((item, i, ar) => ar.indexOf(item) === i)
@@ -177,11 +201,19 @@ class BillScreen extends Component {
               isLoading:false,
               payment: array_payment,
               sum_payment: sum_payment,
-              all_payment: all_payment_data
+              all_payment: all_payment_data,
+              page: res.data.page,
+              total_page: res.data.total_page
+            }, () => {
+              this.roomFilter(this.state.currentIndex)
+            } )
+          }else {
+            this.setState({
+              isLoading: false
             })
           }
         })
-    }
+    })
   }
 
   getTitle (period) {
@@ -302,26 +334,26 @@ class BillScreen extends Component {
       data.details.map((det) => {
         if(det.sequence === 1){
           room_cost = det.cost
-          room_extra_info = det.extra_info != null ? det.extra_info : ''
+          // room_extra_info = det.extra_info && det.extra_info != null ? det.extra_info : ''
-          descriptionRoom = det.descript == '' ? '-' : det.descript
+          descriptionRoom = det.descript && det.descript == '' ? '-' : det.descript
         }
 
         if(det.sequence === 2){
           water_cost = det.cost
-          water_extra_info = det.extra_info != null ? det.extra_info : ''
+          // water_extra_info = det.extra_info && det.extra_info != null ? det.extra_info : ''
-          descriptionWater = det.descript == '' ? '-' : det.descript
+          descriptionWater = det.descript && det.descript == '' ? '-' : det.descript
         }
 
         if(det.sequence === 3){
           electrict_cost = det.cost
-          electrict_extra_info = det.extra_info != null ? det.extra_info : ''
+          // electrict_extra_info = det.extra_info && det.extra_info != null ? det.extra_info : ''
-          descriptionElec = det.descript == '' ? '-' : det.descript
+          descriptionElec = det.descript && det.descript == '' ? '-' : det.descript
         }
 
         if(det.sequence === 4){
           service_cost = det.cost
-          service_extra_info = det.extra_info != null ? det.extra_info : ''
+          // service_extra_info = det.extra_info && det.extra_info != null ? det.extra_info : ''
-          descriptionService = det.descript == '' ? '-' : det.descript
+          descriptionService = det.descript && det.descript == '' ? '-' : det.descript
         }
       })
     }
@@ -396,31 +428,82 @@ class BillScreen extends Component {
     }
   }
 
+  handlePrevious = () => {
+    let currentIndex = this.state.currentIndex - 1;
+    
+    this.setState({
+      currentIndex,
+      activePage: currentIndex
+    }, () => {
+      this.roomFilter(this.state.currentIndex)
+      this.flatListRef.scrollToIndex({index: this.state.currentIndex, animated: true})
+    })
+  }
+
+  handleNext = () => {
+    let currentIndex = this.state.currentIndex;
+    let dataLength = this.state.sum_payment.length
+    if(dataLength > this.state.currentIndex) {
+      currentIndex += 1;
+      this.roomFilter(currentIndex)
+      this.setState({
+        currentIndex,
+        activePage: currentIndex
+      }, () => {
+        this.flatListRef.scrollToIndex({index: currentIndex, animated: true})
+        if(dataLength - 1 == this.state.currentIndex && this.state.page < this.state.total_page) {
+          this.setState({
+            page: parseInt(this.state.page) + 1
+          }, () => {
+            this.getPaymentPagination()
+          })
+        }
+      })
+    }
+  }
+
   renderNativeItemImages = (item) => {
     // console.log('check data item ',item)
-    return <View style={{width: width, alignItems: 'center', paddingTop: 10, paddingBottom: 40,height: 177,}}>
+    return <View style={{display: 'flex', flexDirection: 'row', alignItems: 'center', position: 'relative'}}>
-      <View style={{width: '60%', height: '100%', backgroundColor: '#06ADB8', borderRadius: 5 }}>
+      {
-        <LinearGradient colors={['#4BAF3B', '#0e5e29']} style={{ flex:1, borderRadius: 5, height: 120,paddingBottom:10, justifyContent:'space-between'}}>
+        this.state.currentIndex > 0 && 
-          <View style={{ padding: 16,paddingBottom: 5,paddingTop:10 , borderRadius: 5}}>
+        <TouchableOpacity onPress={this.handlePrevious} style={{position: 'absolute', left: 5, zIndex: 1}}>
-            <Text style={{ color: 'white', fontSize: 18 }}>{t('room')} {item.room}</Text>
+          <IconAntDesign name="left" size={35} color={'#0e5e29'}></IconAntDesign>
-            <Text style={{ color: 'rgba(255, 255, 255, 0.65)', fontSize: 14 }}>{item.project && item.project.name}</Text>
+        </TouchableOpacity>
-            <Text style={{ color: 'white' }}>{t('outstanding_balance')}    <Text style={{ color: 'white' ,fontSize:18 }}>{item.total_cost} {t('baht')}</Text></Text>
+      }
+        
+        <View style={{width: width, alignItems: 'center', paddingTop: 10, paddingBottom: 40,height: 177, zIndex: 0}}>
+          <View style={{width: '65%', height: '100%', backgroundColor: '#06ADB8', borderRadius: 5 }}>
+            <LinearGradient colors={['#4BAF3B', '#0e5e29']} style={{ flex:1, borderRadius: 5, height: 120,paddingBottom:10, justifyContent:'space-between'}}>
+              <View style={{ padding: 16,paddingBottom: 5,paddingTop:10 , borderRadius: 5}}>
+                <Text style={{ color: 'white', fontSize: 18 }}>{t('room')} {item.room}</Text>
+                <Text style={{ color: 'rgba(255, 255, 255, 0.65)', fontSize: 14 }}>{item.project && item.project.name}</Text>
+                <Text style={{ color: 'white' }}>{t('outstanding_balance')}    <Text style={{ color: 'white' ,fontSize:18 }}>{item.total_cost} {t('baht')}</Text></Text>
+              </View>
+
+              {
+                item.due_at !== null
+                    ? (
+                        <View style={{height:24,backgroundColor: '#FF2D55',justifyContent:'center',alignItems:'center'}}>
+                          <Text style={{ fontSize: 12, color: 'white'}}>{t('please_pay_within')} {this.getDueDate(item.due_at)}</Text>
+                        </View>
+                    )
+                    : null
+              }
+
+            </LinearGradient>
           </View>
-
+        </View>
-          {
+        
-            item.due_at !== null
+        {
-                ? (
+          this.state.currentIndex < this.state.sum_payment.length - 1 &&
-                    <View style={{height:24,backgroundColor: '#FF2D55',justifyContent:'center',alignItems:'center'}}>
+          <TouchableOpacity onPress={this.handleNext} style={{position: 'absolute', right: 5, zIndex: 1}}>
-                      <Text style={{ fontSize: 12, color: 'white'}}>{t('please_pay_within')} {this.getDueDate(item.due_at)}</Text>
+            <IconAntDesign name="right" size={35} color={'#0e5e29'}></IconAntDesign>
-                    </View>
+        </TouchableOpacity>
-                )
+        }
-                : null
-          }
-
-        </LinearGradient>
       </View>
-    </View>
   }
+
   _onCarouselScroll(e) {
     const scrollX = e.nativeEvent.contentOffset.x
     this.setState({
@@ -444,31 +527,55 @@ class BillScreen extends Component {
         return obj.room_id === another_room
       }, false);
     });
-    this.state.payment = payment_array;
+    this.setState({
+      payment: payment_array
+    })
   }
 
   _keyExtractor = (item, index) => 'bill_'+index
 
+  handleSearch = (search) => {
+    this.setState({
+      search
+    }, () => {
+      this.debounceSearch()
+    })
+  }
+
   render() {
     return (
       <SafeAreaView style={{flex: 1}}>
         <ScrollView contentContainerStyle={styles.contentContainer}>
           <View style={{ alignItems: 'center'}}>
+            <View>
+              <CustomInput
+                onChangeText={this.handleSearch}
+                inputTextAlign={'left'}
+                iconName={'ic_search'}
+                placeholder={'Search Room'}
+                placeholderTextColor={'#FFFFFF40'}
+                value={this.state.search}
+                style={styles.form_input} />
+            </View>
+
             {
               this.state.sum_payment.length == 0 &&
-              <View style={{margin:16,width: '90%', height: 55,backgroundColor:'#00000080',justifyContent:'center',alignItems:'center',borderRadius:5}}>
+                <View style={{margin:16,width: '90%', height: 55,backgroundColor:'#00000080',justifyContent:'center',alignItems:'center',borderRadius:5}}>
-                 <Text style={{fontSize:14,color:'white',textAlign:'center'}}>{this.props.user.room} {t('no_outstanding_balance')}</Text>
+                  <Text style={{fontSize:14,color:'white',textAlign:'center'}}>{this.state.search === '' ? t('no_outstanding_balance') : t('room_not_found')}</Text>
-              </View>
+                </View>
             }
+
             <FlatList
               data={this.state.sum_payment}
               renderItem={({ item }) => this.renderNativeItemImages(item)}
               horizontal={true}
-              onScroll={this._onCarouselScroll}
+              // onScroll={this._onCarouselScroll}
-              onScrollEndDrag={this.roomFilter(this.state.activePage)}
+              // onScrollEndDrag={this.roomFilter(this.state.activePage)}
-              pagingEnabled={true}
+              // pagingEnabled={true}
               extraData={this.state}
               keyExtractor={this._keyExtractor}
+              scrollEnabled={false}
+              ref={(flatlist) => { this.flatListRef = flatlist }}
             />
             <View style={{ position: 'absolute', bottom: 10, width: '100%', justifyContent: 'center', flexDirection: 'row' }}>
               {this.state.sum_payment.map((item, i) => <View key={'sum_payment_'+i} style={[{ width: 10, height: 10, borderRadius: 5, backgroundColor: this.state.activePage == i ? '#269A21' : 'rgba(124, 187, 51, 0.3)', marginHorizontal: 4 }]}></View>)}
@@ -477,7 +584,7 @@ class BillScreen extends Component {
           <View style={{flex:1}}>
             <Accordion
                 dataArray={ this.state.payment }
-                expanded={this.state.payment.length - 1}
+                expanded={this.state.payment && this.state.payment.length > 0 ? this.state.payment.length - 1 : []}
                 renderHeader={(data, expanded) => { return this._renderHeader(data, expanded) }}
                 renderContent={(data) => { return this._renderContent(data) }} />
           </View>
@@ -503,7 +610,15 @@ const styles = StyleSheet.create({
   },
   colorTextPayment: {
     color: '#3AA40C'
-  }
+  },
+  form_input: {
+    backgroundColor: '#4BAF3B',
+    borderColor: '#0e5e29',
+    borderRadius: 30,
+    borderWidth: 1,
+    width: '80%',
+    marginTop: 10
+  },
 })
 
 const mapDisPatchToProps = state => ({

src/screens/bill/Payment.js

@@ -8,6 +8,7 @@ import ViewShot, { captureRef } from "react-native-view-shot";
 import IndicatorLoading from '../../components/IndicatorLoading';
 import QRCode from 'react-native-qrcode-svg';
 import { t } from '../../utils/i18n';
+import DeviceInfo from 'react-native-device-info'
 
 class PaymentScreen extends Component {
   constructor(props) {
@@ -50,19 +51,27 @@ class PaymentScreen extends Component {
   async snapScreen() {
     try {
       if(Platform.OS == 'android'){
-        const granted = await PermissionsAndroid.request(
+        let deviceVersion = DeviceInfo.getSystemVersion();
-          PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+        let granted = PermissionsAndroid.RESULTS.DENIED;
-          {
+        if(deviceVersion >= 13){
-            title: 'Cool Photo App Camera Permission',
+          granted = PermissionsAndroid.RESULTS.GRANTED;
-            message:
+            console.log('granted >>>> ', granted)
-              'Cool Photo App needs access to your camera ' +
+        }else{
-              'so you can take awesome pictures.',
+          granted = await PermissionsAndroid.request(
-            buttonNeutral: 'Ask Me Later',
+             PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE ,
-            buttonNegative: 'Cancel',
+               {
-            buttonPositive: 'OK',
+                 title: 'Cool Photo App Camera Permission',
-          },
+                 message:
-        );
+                   'Cool Photo App needs access to your camera ' +
-        if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+                   'so you can take awesome pictures.',
+                 buttonNeutral: 'Ask Me Later',
+                 buttonNegative: 'Cancel',
+                 buttonPositive: 'OK',
+               },
+             );
+        }
+
+        if(granted === PermissionsAndroid.RESULTS.GRANTED) {
           console.log('You can use the camera');
           this.viewshot.capture()
           .then(

src/screens/login/Login.js

@@ -24,17 +24,16 @@ class LoginScreen extends Component {
     this.state = {
       isLoading: false,
       username: null,
-      password: null,
+      password: null
-      payment: [],
-      sum_payment: [],
-      all_payment : [],
-      room_number_array : [],
     }
     this._login = this._login.bind(this)
   }
 
   async _login () {
-    if (this.state.username && this.state.password) {
+    this.setState({
+      isLoading: true
+    }, async () => {
+      if (this.state.username && this.state.password) {
       var regex = /^\d+$/;
 
       if (regex.test(this.state.username) === true) {
@@ -64,77 +63,17 @@ class LoginScreen extends Component {
               if (res.data.token) {
                 setToken(res.data.token)
                 this.props.appSetToken(res.data.token)
+                this.props.navigation.navigate('HomeScreen',{isLogin:true})
                 let user_data = res.data.user;
-
+                this.props.appSetUser(user_data)
-                payment(user_data.id)
-                  .then(res => {
-                    if(res.ok){
-                      let sum_payment = [];
-                      let array_payment = [];
-                      let sum_cost_room = res.data && res.data.sum_cost_room;
-                      if(sum_cost_room && Object.keys(sum_cost_room).length > 0) {
-                        Object.keys(sum_cost_room).map((sum_cost) => {
-                          sum_payment.push({
-                              total_cost : sum_cost_room[sum_cost].total_cost,
-                              room: sum_cost_room[sum_cost].room,
-                              project: sum_cost_room[sum_cost].project,
-                              due_at: sum_cost_room[sum_cost].due_at,
-                            }
-                          )
-                        })
-                      }
-
-                      let payment = res.data && res.data.payment_room_period
-                      if(payment && Object.keys(payment).length > 0){
-                        Object.keys(payment).map((pay) => {
-                          if(Object.keys(payment[pay]).length > 0){
-                            Object.keys(payment[pay]).map((detail) => {
-                              this.state.room_number_array.push(pay)
-                              array_payment.push({
-                                room_id: pay,
-                                period: detail,
-                                ...payment[pay][detail]
-                              })
-                            })
-                          }
-                        })
-                      }
-                      let all_payment_data = array_payment;
-                      let array_room_no = this.state.room_number_array;
-                      this.setState({
-                        room_number_array: array_room_no.filter((item, i, ar) => ar.indexOf(item) === i).reverse()
-                      });
-                      this.setState({
-                        payment: array_payment,
-                        sum_payment: sum_payment,
-                        all_payment: all_payment_data
-                      })
-
-                      user_data["room"] = this.state.room_number_array.join();
-                      this.props.appSetUser(user_data)
-                      setTimeout(() => {
-                        this.setState({isLoading:false},() => {
-                          this.props.navigation.navigate('HomeScreen',{isLogin:true})
-                        })
-                      }, 300);
-
-                    }else{
-                      this.props.appSetUser(res.data.user)
-                      setTimeout(() => {
-                        this.setState({isLoading:false},() => {
-                          this.props.navigation.navigate('HomeScreen',{isLogin:true})
-                        })
-                      }, 300);
-                    }
-                  })
-
               }
+              this.setState({ isLoading: false })
             } else {
               setTimeout(() => {
                 Alert.alert(null, 'ท่านกรอก บัญชีผู้ใช้งาน หรือ รหัสผ่านผิด')
               }, 600);
+              this.setState({isLoading:false})
             }
-            this.setState({isLoading:false})
           })
       } else {
         Alert.alert(null, 'ท่านกรอกรูปแบบโทรศัพท์ไม่ถูกต้อง')
@@ -142,6 +81,8 @@ class LoginScreen extends Component {
     } else {
       Alert.alert(null, 'กรุณากรอกข้อมูลให้ครบถ้วน')
     }
+    })
+    
   };
 
   render() {

src/screens/login/RegisterProfile.js

@@ -70,10 +70,10 @@ class RegisterProfileScreen extends Component {
   }
 
 
-  _register() {
+  async _register() {
       this.setState({disableButton: true})
        if (!this.props.device && this.props.push_token) {
-        const resultSendDevice = registerDevice(this.props.push_token)
+        const resultSendDevice = await registerDevice(this.props.push_token)
         if (resultSendDevice.ok && resultSendDevice.data.success) {
           this.props.appSetDevice(resultSendDevice.data.device)
         }

src/screens/meters/Meter.js

@@ -46,8 +46,12 @@ export default class Meter extends Component {
     .then(res => {
       console.log('check response meter list ----------> ',res.data);
       if(res.ok){
+        // let room_list = [
+        //   {id: 87576, name: 'CN1-005', project_name: 'CNK', electric: 1264, water: 0}
+        // ]
         this.setState({
           room_list: res.data.rooms,
+          // room_list,
           cost_list: res.data.data,
         })
       }
@@ -91,7 +95,7 @@ export default class Meter extends Component {
       }, () => {
         this.selectedImage(this.state.image_url)
       })
-    }).catch(e => {})
+    }).catch(e => {console.log('e >>>> ', e)})
   }
 
   selectedImage(image_meter){

src/screens/news/News.js

@@ -11,7 +11,17 @@ import LinearGradient from 'react-native-linear-gradient'
 import { BackgroundImage } from '../../components/BackgroundImage'
 import Text from '../../components/Text'
 import { NavigationEvents } from 'react-navigation'
-import {getNews, getNewsPage, getUserProfile, getNewsByProject, login, registerDevice, setPaymentLater, setFillInMeterLater, checkPaymentMeter} from '../../api/UserApi';
+import {
+  getNews,
+  getNewsPage,
+  getUserProfile, 
+  getNewsByProject, 
+  login, 
+  registerDevice, 
+  setPaymentLater, 
+  setFillInMeterLater, 
+  checkPaymentMeter } from '../../api/UserApi';
+import { clearToken } from '../../api/api'
 import { bindActionCreators } from 'redux'
 import {
   appSetDevice,
@@ -21,7 +31,8 @@ import {
   appCleanToken,
   appCleanUser,
   appSetNotification,
-  appSetProjectID
+  appSetProjectID,
+  appCleanProjectID
 } from '../../redux/app/action'
 import { connect } from 'react-redux'
 import moment from 'moment'
@@ -106,8 +117,6 @@ function PopupOverDue({isVisible, onPress, onCancel, onPressLater, pending_payme
 }
 
 function PopupNotiFillInMeter({isVisible, onPress, onCancel, onPressLater, notified_meter_at}) {
-  console.log('show PopupNotiFillInMeter');
-
   return <Modal visible={isVisible} transparent={true} animationType="none" key="popup-noti-meter">
     <View style={styles.popupNotiContainer}>
       <View style={[styles.popupNoti, {paddingHorizontal: 15}]}>
@@ -192,7 +201,7 @@ class NewsScreen extends Component {
 
   componentDidMount () {
     // this.initData()
-      this.checkNotifiedPopup()
+      // this.checkNotifiedPopup()
   }
 
   checkNotifiedPopup = () => {
@@ -210,9 +219,10 @@ class NewsScreen extends Component {
               due_at_payment: res.data.payment && res.data.payment.due_at ? res.data.payment.due_at : null,
             }, () => {
               setTimeout(() => {
+                console.log('pending payment >>> ', parseInt(this.state.pending_payment))
                 this.setState({
-                  visibleNotiElectric: this.state.is_notified_overdue ? false : this.state.is_notified_electric,
+                  visibleNotiElectric: this.state.is_notified_overdue ? false : this.state.is_notified_electric && parseInt(this.state.pending_payment) > 0,
-                  visibleNotiMeter: (this.state.is_notified_electric || this.state.is_notified_overdue) === true ? false : this.state.is_notified_meter,
+                  visibleNotiMeter: ((this.state.is_notified_electric && parseInt(this.state.pending_payment) > 0) || this.state.is_notified_overdue) === true ? false : this.state.is_notified_meter,
                   visibleNotiOverDue: this.state.is_notified_overdue,
                 })
               }, 1000)
@@ -226,9 +236,10 @@ class NewsScreen extends Component {
     if (this.props.token != null) {
       return await getUserProfile()
         .then(res => {
-          if (res.ok) {
+          if (res.ok && res.data?.success) {
-            console.log("News:: res.data:")
+            console.log("User:: res.data:")
             console.log(res.data)
+            this.checkNotifiedPopup()
             this.setState({
               noti_count: res.data.count_noti,
               user_point: res.data.point_balance,
@@ -244,14 +255,19 @@ class NewsScreen extends Component {
               }
             })
           } else {
-            //setTimeout(() => {
+            // this.setState({
-              this.setState({
+              // isLoading: false
-                isLoading: false
+            // }, () => {
-              }, () => {
+              clearToken();
-                this.props.appCleanUser()
+
-                this.props.appCleanToken()
+              setTimeout(() => {
-              })
+                this.props.appCleanUser();
-            //}, 600)
+                this.props.appCleanToken();
+                this.props.appCleanProjectID();
+                
+                this.initData()
+              }, 500)
+            // })
           }
         })
     }
@@ -393,7 +409,7 @@ class NewsScreen extends Component {
     }, () => {
       this.initData()
       this.initNotification()
-      this.checkNotifiedPopup()
+      // this.checkNotifiedPopup()
     })
   }
 
@@ -537,7 +553,7 @@ class NewsScreen extends Component {
               isLoading: true
             }, () => {
               this.initData()
-              this.checkNotifiedPopup()
+              // this.checkNotifiedPopup()
             })
             /*let checkNav = this.props.navigation.getParam('isLogin')
             if (checkNav) {
@@ -666,7 +682,7 @@ class NewsScreen extends Component {
               ) : (
                 <View style={{ padding: 5 }}>
                   <View style={[styles.row, { alignItems: 'stretch' }]}>
-                    <View style={styles.custom_card}>
+                    <View style={{width: '100%'}}>
                       <Card style={{ borderRadius: 5, backgroundColor: '#00420A', borderColor: 'rbga(0,0,0,0)', flex: 1 }}>
                         <BackgroundImage_RegisterForm>
                           <View style={{ flex: 1, flexDirection: 'column', alignItems: 'center', justifyContent: 'center', padding: 10, minHeight: 177 }}>
@@ -689,7 +705,7 @@ class NewsScreen extends Component {
                         </BackgroundImage_RegisterForm>
                       </Card>
                     </View>
-                    <View style={[styles.custom_card]}>
+                    {/* <View style={[styles.custom_card]}>
                       <Card title='' style={{ borderRadius: 5, backgroundColor: '#003114', borderColor: 'rbga(0,0,0,0)', flex: 1 }}>
                         <BackgroundImage_RegisterForm>
                           <View style={{
@@ -701,19 +717,16 @@ class NewsScreen extends Component {
                             minHeight: 177,
                           }}>
                             <Icon name='ic_star' color='white' size={24}/>
-                            {/*<Text style={{ color: 'white', fontSize: 14, marginTop:5 }}>คะแนนสะสม</Text>*/}
                             <Text style={{ color: 'white', fontSize: 14, marginTop: 5 }}>{t('view_points')}</Text>
                             <Text style={{ color: 'white', fontSize: 28 }}>{this.state.user_point}</Text>
-                            {/*<Text style={{ color: 'white', fontSize: 18 }}>พอยต์</Text>*/}
                             <Text style={{ color: 'white', fontSize: 14 }}>{t('point')}</Text>
                             <TouchableOpacity style={{ marginTop: 5 }} disabled={true} onPress={() => {}}>
-                              {/*<Badge style={{ backgroundColor: 'gray', borderRadius: 5, borderColor: 'rbga(0,0,0,0)', justifyContent:'center' }}><Text style={{ fontSize: 12, color: 'white' }}>แลกคะแนน</Text></Badge>*/}
                               <Badge style={{ backgroundColor: 'gray', borderRadius: 5, borderColor: 'rbga(0,0,0,0)', justifyContent: 'center' }}><Text style={{ fontSize: 12, color: 'white' }}>{t('redeem')}</Text></Badge>
                             </TouchableOpacity>
                           </View>
                         </BackgroundImage_RegisterForm>
                       </Card>
-                    </View>
+                    </View> */}
                   </View>
                   <View style={[styles.row, { flexWrap: 'wrap', alignItems: 'stretch' }]}>
                     <View style={[styles.custom_card]}>
@@ -978,6 +991,7 @@ const setUser = dispatch => bindActionCreators({
   appCleanUser,
   appSetNotification,
   appSetProjectID,
-  setPaymentLater
+  setPaymentLater,
+  appCleanProjectID
 }, dispatch)
 export default connect(mapDisPatchToProps, setUser)(NewsScreen)

src/screens/profile/Profile.js

@@ -9,7 +9,7 @@ import Icon from 'src/components/Icon'
 import { CustomButton } from '../../components/CustomButton'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { getUserProfile } from '../../api/UserApi';
+import { getUserProfile, requestDeleteAccount } from '../../api/UserApi';
 import moment from 'moment'
 import { NavigationEvents } from 'react-navigation'
 import IndicatorLoading from '../../components/IndicatorLoading';
@@ -93,6 +93,40 @@ class ProfileScreen extends Component {
       window.location.reload(false);
   }
 
+  confirmDeleteAccount = () => {
+    Alert.alert('ต้องการลบบัญชีใช่หรือไม่ ?', 'คำขอของท่านจะถูกส่งไปยังผู้ดุแลเพื่อตรวจสอบและทำการลบบัญชี อาจใช้เวลาประมาณ 30 วัน', [
+      {
+        text: t('cancel')
+      },
+      {
+        text: t('ok'),
+        onPress: () => {
+          this.deleteAccount()
+        }
+      }
+    ])
+  }
+
+  deleteAccount = () => {
+    this.setState({
+      isLoading: true
+    }, () => {
+      requestDeleteAccount().then((res) => {
+        if(res.data?.success) {
+          Alert.alert('ทำรายการสำเร็จ')
+          this.setState({
+            isLoading: false
+          })
+        }else {
+          Alert.alert('ทำรายการสำเร็จไม่สำเร็จ', 'กรุณาติดต่อผู้ดูแลเพื่อขอลบบัญชี')
+          this.setState({
+            isLoading: false
+          })
+        }
+      }) 
+    })
+  }
+
   render() {
     return (
       <LinearGradient colors={['#00420A', '#00420A']} style={{
@@ -176,7 +210,7 @@ class ProfileScreen extends Component {
 
           {
             !this.state.user.fb_is_link?
-            <View style={{ flexGrow: 0.5, justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
+            <View style={{ justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
               <Button block style={{ backgroundColor: '#145EB3', marginHorizontal: 15 }}
                 onPress={() => {
                   setTimeout( () => {
@@ -187,7 +221,7 @@ class ProfileScreen extends Component {
               </Button>
             </View>
             :
-            <View style={{ flexGrow: 0.5, justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
+            <View style={{ justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
               <Button block style={{ backgroundColor: '#145EB3', marginHorizontal: 15 }}
                 onPress={() => {
                   disconnectWithFacebook(this.disConnectFBSuccess);
@@ -198,7 +232,7 @@ class ProfileScreen extends Component {
             </View>
           }
 
-          <View style={{ flexGrow: 0.5, justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
+          <View style={{ justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
             <Button block style={{ backgroundColor: '#145EB3', margin:15 }}
               onPress={() => { this.props.navigation.navigate('EditProfile',{
                 user:this.props.user,
@@ -207,6 +241,14 @@ class ProfileScreen extends Component {
               <Text style={{ color: '#ffffff', fontSize: 14 }}><Icon name={'ic_edit'} size={15}/>  {t('edit_profile')} </Text>
             </Button>
           </View>
+
+          <View style={{ justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
+            <Button block
+                style={{backgroundColor: 'transparent', marginBottom: 15}}
+                onPress={() => { this.confirmDeleteAccount() }}>
+              <Text style={{ color: 'red', fontSize: 16 }}> {t('delete_account')} </Text>
+            </Button>
+          </View>
         </BackgroundImage_RegisterForm>
         <IndicatorLoading loadingVisible={this.state.isLoading}/>
       </LinearGradient>

src/screens/repair/RepairService.js

@@ -216,7 +216,7 @@ export default class RepairService extends Component {
             // onScrollEndDrag={this.roomFilter(this.state.activePage)}
           />
           <View style={{ position: 'absolute', bottom: 10, width: '100%', justifyContent: 'center', flexDirection: 'row' }}>
-            {this.state.room_list.map((item, i) => <View key={'sum_repair'+i} style={[{ width: 10, height: 10, borderRadius: 5, backgroundColor: this.state.activePage == i ? '#269A21' : 'rgba(124, 187, 51, 0.3)', marginHorizontal: 4 }]}></View>)}
+            { this.state.room_list?.length > 0 && this.state.room_list.map((item, i) => <View key={'sum_repair'+i} style={[{ width: 10, height: 10, borderRadius: 5, backgroundColor: this.state.activePage == i ? '#269A21' : 'rgba(124, 187, 51, 0.3)', marginHorizontal: 4 }]}></View>) }
           </View>
         </View>
 

src/screens/service/Service.js

@@ -15,6 +15,7 @@ import {clearToken} from "../../api/api";
 import DeviceInfo from 'react-native-device-info';
 import { t } from 'src/utils/i18n'
 import {getUserProfile, logout} from "../../api/UserApi";
+import IndicatorLoading from '../../components/IndicatorLoading'
 
 const buildVersion = DeviceInfo.getVersion()
 const buildNumber = DeviceInfo.getBuildNumber()
@@ -45,7 +46,8 @@ class ServiceScreen extends Component {
       user: {
         point: 0
       },
-      profileImage : require('../../../assets/images/praw.png')
+      profileImage : require('../../../assets/images/praw.png'),
+      isLoadingLogout: false
     }
   }
 
@@ -79,7 +81,10 @@ class ServiceScreen extends Component {
   }
 
   _logout() {
-    logout()
+    this.setState({
+       isLoadingLogout : true
+    }, () => {
+      logout()
       .then(res => {
         console.log('response >>> ', res.data);
         if(res.data && res.data.status === 'success'){
@@ -92,14 +97,16 @@ class ServiceScreen extends Component {
             this.setState({
               auth: false
             }, () => {
+              this.setState({ isLoadingLogout: false})
               this.props.navigation.navigate('HomeScreen',{isLogin:true})
             })
           }, 500)
         }else {
+          this.setState({ isLoadingLogout: false})
           Alert.alert('Logout unsuccessfully');
         }
       })
-
+    })
   }
 
   getUserData(){
@@ -152,9 +159,9 @@ class ServiceScreen extends Component {
 
                     }
                   </View>
-                  <Badge style={{backgroundColor: '#269A21', borderRadius: 50, marginLeft: 5, height: 24, marginTop: 5, justifyContent: 'center'}}>
+                  {/* <Badge style={{backgroundColor: '#269A21', borderRadius: 50, marginLeft: 5, height: 24, marginTop: 5, justifyContent: 'center'}}>
                     <Text style={{fontSize: 14, color: 'white', marginHorizontal: 10}}><Icon name="ic_star" size={14} color="white"/> 0</Text>
-                  </Badge>
+                  </Badge> */}
                 </View>
                 <TouchableOpacity
                   style={{flex: 1, justifyContent: 'center', width: 45,}}
@@ -211,6 +218,8 @@ class ServiceScreen extends Component {
               <Text style={{textAlign:'right',color:'#00000026',fontSize:12}}>v{buildVersion} ({buildNumber})</Text>
             </View>
           </View>
+
+          <IndicatorLoading loadingVisible={this.state.isLoadingLogout}/>
         </BackgroundImage>
       </LinearGradient>
     )

src/translations/en.json

@@ -197,5 +197,6 @@
   "meter_noti": "Electric Meter",
   "title": "Title",
   "update_app": "Update Application",
-  "payment_success": "Payment Success"
+  "payment_success": "Payment Success",
+  "delete_account": "Delete Account"
 }

src/translations/km.json

@@ -193,5 +193,6 @@
   "new_message": "New Message",
   "bill_payment": "Bill Payment",
   "meter_noti": "Electric Meter",
-  "title": "Title"
+  "title": "Title",
+  "delete_account": "Delete Account"
 }

src/translations/my.json

@@ -193,5 +193,6 @@
   "new_message": "New Message",
   "bill_payment": "Bill Payment",
   "meter_noti": "Electric Meter",
-  "title": "Title"
+  "title": "Title",
+  "delete_account": "Delete Account"
 }

src/translations/th.json

@@ -197,5 +197,6 @@
   "meter_noti": "เลขมิเตอร์น้ำ-ไฟฟ้า",
   "title": "หัวข้อ",
   "update_app": "อัปเดตแอปพลิเคชัน",
-  "payment_success": "ชำระเงินสำเร็จ"
+  "payment_success": "ชำระเงินสำเร็จ",
+  "delete_account": "ลบบัญชี"
 }