diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index 4fe6f5fc..7edd3ccd 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -16,6 +16,7 @@
 -keep class * implements com.google.gson.TypeAdapterFactory
 -keep class * implements com.google.gson.JsonSerializer
 -keep class * implements com.google.gson.JsonDeserializer
+-keep class com.hiennv.flutter_callkit_incoming.** { *; }
 
 -ignorewarnings
 -keepattributes *Annotation*
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 70fa7d5b..4d4dcfee 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -17,6 +17,9 @@
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
 
     <queries>
         <intent>
@@ -59,7 +62,7 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
             android:hardwareAccelerated="true"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
diff --git a/assets/images/calling/audio_call_icon.svg b/assets/images/calling/audio_call_icon.svg
new file mode 100644
index 00000000..d6eacdeb
--- /dev/null
+++ b/assets/images/calling/audio_call_icon.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.8065 1.16447C14.2759 1.01134 13.7216 1.31736 13.5685 1.84799C13.4154 2.37863 13.7214 2.93292 14.252 3.08605C17.4591 4.01154 19.9889 6.54122 20.9145 9.74819C21.0676 10.2788 21.6219 10.5848 22.1526 10.4317C22.6832 10.2785 22.9892 9.72421 22.836 9.19358C21.7199 5.32634 18.6739 2.28049 14.8065 1.16447Z" fill="#3B3D4A"/>
+<path d="M14.2661 6.03666C13.7578 5.82079 13.1707 6.05789 12.9548 6.56624C12.7389 7.07459 12.976 7.66169 13.4844 7.87756C14.6692 8.38068 15.6199 9.33137 16.123 10.5161C16.3389 11.0245 16.926 11.2616 17.4343 11.0457C17.9427 10.8298 18.1798 10.2427 17.9639 9.73438C17.2582 8.07269 15.9278 6.74231 14.2661 6.03666Z" fill="#3B3D4A"/>
+<path d="M6.49064 2.4124C6.21024 1.90937 5.75895 1.52863 5.19226 1.41151C4.61966 1.29316 4.04411 1.46773 3.57108 1.85327C1.85471 3.25218 0.76188 5.49346 1.23618 7.84468C1.52772 9.28994 2.01343 10.7159 3.00255 12.4406C4.98763 15.902 8.0947 19.0108 11.5601 20.9981C13.2848 21.9873 14.7108 22.473 16.156 22.7645C18.5072 23.2388 20.7485 22.146 22.1474 20.4296C22.533 19.9566 22.7075 19.381 22.5892 18.8084C22.4721 18.2417 22.0913 17.7904 21.5883 17.5101L19.9857 16.6168C19.3956 16.2878 18.8989 16.0109 18.4672 15.8301C18.0092 15.6383 17.5575 15.5244 17.0581 15.5765C16.5588 15.6286 16.1403 15.8332 15.7318 16.1154C15.3466 16.3814 14.9177 16.7548 14.4081 17.1985L12.8998 18.5116C12.6296 18.7469 12.4944 18.8645 12.3255 18.8753C12.1566 18.886 12.0124 18.7896 11.7238 18.5967C9.26273 16.9518 7.04759 14.7358 5.404 12.2768C5.21116 11.9882 5.11474 11.844 5.12549 11.6751C5.13624 11.5062 5.25389 11.3711 5.48917 11.1008L6.80218 9.59261C7.24588 9.08298 7.61928 8.65411 7.88529 8.26893C8.16746 7.86034 8.37211 7.4419 8.42419 6.94254C8.47626 6.44318 8.36235 5.99152 8.17054 5.53351C7.98973 5.10174 7.71286 4.60505 7.38385 4.01485L6.49064 2.4124Z" fill="#3B3D4A"/>
+</svg>
diff --git a/assets/images/calling/call_user_avatar.svg b/assets/images/calling/call_user_avatar.svg
new file mode 100644
index 00000000..f4560bac
--- /dev/null
+++ b/assets/images/calling/call_user_avatar.svg
@@ -0,0 +1,4 @@
+<svg width="58" height="58" viewBox="0 0 58 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.3018 3.01044C21.3189 3.01044 15.6581 8.67122 15.6581 15.6542C15.6581 22.6371 21.3189 28.2979 28.3018 28.2979C35.2847 28.2979 40.9455 22.6371 40.9455 15.6542C40.9455 8.67122 35.2847 3.01044 28.3018 3.01044Z" fill="white"/>
+<path d="M43.2934 36.3107C42.9057 36.0918 42.563 35.8983 42.2852 35.733C33.7257 30.6362 22.8782 30.6362 14.3189 35.733C14.0388 35.8997 13.6927 36.095 13.301 36.3161C11.5843 37.2845 8.9893 38.7485 7.21154 40.4885C6.09968 41.5768 5.04327 43.011 4.8512 44.7681C4.64698 46.6365 5.4621 48.39 7.09741 49.9479C9.91865 52.6356 13.3042 54.7897 17.6833 54.7897H38.9207C43.2998 54.7897 46.6854 52.6356 49.5066 49.9479C51.1418 48.39 51.957 46.6365 51.7528 44.7681C51.5606 43.011 50.5043 41.5768 49.3924 40.4885C47.6146 38.7485 45.0196 37.2845 43.3029 36.3161L43.2934 36.3107Z" fill="white"/>
+</svg>
diff --git a/assets/images/calling/end_call.svg b/assets/images/calling/end_call.svg
new file mode 100644
index 00000000..7831d55f
--- /dev/null
+++ b/assets/images/calling/end_call.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.5368 4.99141C18.3737 3.89234 13.6254 3.89106 9.45743 4.99141C7.37923 5.54005 5.91035 6.24306 4.57538 7.10677C2.35643 8.54243 1.45543 11.0949 1.70423 13.473C1.77726 14.1709 2.11459 14.7881 2.69607 15.1604C3.2673 15.5262 3.95202 15.5781 4.5849 15.4029L6.48667 14.8765C7.17775 14.6852 7.7732 14.5204 8.24752 14.3312C8.75523 14.1286 9.21756 13.8638 9.58726 13.4198C9.95867 12.9739 10.1323 12.4724 10.2327 11.9384C10.3257 11.4435 10.3686 10.8386 10.418 10.1428L10.5712 7.98564C10.5919 7.69432 10.6022 7.54866 10.6933 7.44677C10.7843 7.34488 10.9247 7.31887 11.2056 7.26684C14.3271 6.68853 17.6695 6.68902 20.7886 7.26685C21.0694 7.31888 21.2099 7.34489 21.3009 7.44678C21.392 7.54867 21.4023 7.69433 21.423 7.98565L21.5762 10.1428C21.6256 10.8386 21.6685 11.4435 21.7615 11.9384C21.8619 12.4724 22.0355 12.9739 22.4069 13.4198C22.7766 13.8638 23.239 14.1286 23.7467 14.3312C24.221 14.5204 24.8165 14.6852 25.5076 14.8765L27.4093 15.4029C28.0422 15.5781 28.7269 15.5262 29.2981 15.1604C29.8796 14.7881 30.2169 14.1709 30.29 13.473C30.5388 11.0949 29.6378 8.54243 27.4188 7.10677C26.0838 6.24305 24.615 5.54005 22.5368 4.99141Z" fill="white"/>
+<path d="M16.0036 14.5C16.74 14.5 17.3369 15.0969 17.3369 15.8333V21.8333L18.1136 21.8333C18.3478 21.8332 18.6354 21.8329 18.8706 21.8624L18.8751 21.8629C19.0437 21.884 19.8117 21.9797 20.1775 22.7339C20.5441 23.4896 20.1416 24.1565 20.0545 24.3008L20.0512 24.3061C19.9283 24.5102 19.7494 24.738 19.6023 24.9254L19.5706 24.9657C19.1778 25.4668 18.6685 26.1125 18.1613 26.6338C17.9082 26.8939 17.6185 27.1623 17.3106 27.3741C17.0369 27.5623 16.57 27.8333 15.9958 27.8333C15.4215 27.8333 14.9546 27.5623 14.6809 27.3741C14.3731 27.1623 14.0834 26.8939 13.8303 26.6338C13.323 26.1125 12.8137 25.4668 12.4209 24.9657L12.3893 24.9254C12.2421 24.738 12.0633 24.5102 11.9403 24.3061L11.9371 24.3008C11.85 24.1565 11.4474 23.4896 11.814 22.7339C12.1798 21.9797 12.9479 21.884 13.1165 21.8629L13.1209 21.8624C13.3562 21.8329 13.6437 21.8332 13.8779 21.8333L14.6702 21.8333V15.8333C14.6702 15.0969 15.2672 14.5 16.0036 14.5Z" fill="white"/>
+</svg>
diff --git a/assets/images/calling/mic_disable.svg b/assets/images/calling/mic_disable.svg
new file mode 100644
index 00000000..304f862b
--- /dev/null
+++ b/assets/images/calling/mic_disable.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.29289 1.29289C1.68342 0.902369 2.31658 0.902369 2.70711 1.29289L22.7071 21.2929C23.0976 21.6834 23.0976 22.3166 22.7071 22.7071C22.3166 23.0976 21.6834 23.0976 21.2929 22.7071L16.9406 18.3549C15.7867 19.137 14.4337 19.6528 12.9722 19.8126V20.8269H14.9167C15.4536 20.8269 15.8889 21.2574 15.8889 21.7885C15.8889 22.3195 15.4536 22.75 14.9167 22.75H9.08333C8.54639 22.75 8.11111 22.3195 8.11111 21.7885C8.11111 21.2574 8.54639 20.8269 9.08333 20.8269H11.0278V19.8126C6.65283 19.3343 3.25 15.6659 3.25 11.2115C3.25 10.6805 3.68528 10.25 4.22222 10.25C4.75917 10.25 5.19444 10.6805 5.19444 11.2115C5.19444 14.9288 8.2414 17.9423 12 17.9423C13.2985 17.9423 14.512 17.5827 15.5444 16.9586L14.6763 16.0905C13.8769 16.5116 12.9663 16.75 12 16.75C8.82436 16.75 6.25 14.1756 6.25 11V7.66421L1.29289 2.70711C0.902369 2.31658 0.902369 1.68342 1.29289 1.29289Z" fill="#F4F6FC"/>
+<path d="M12 1.25C15.1756 1.25 17.75 3.82436 17.75 7V11C17.75 11.641 17.6451 12.2575 17.4516 12.8333C17.3374 13.1729 17.2803 13.3428 17.1177 13.3809C16.9551 13.4191 16.819 13.283 16.5467 13.0107L7.62218 4.08618C7.44997 3.91397 7.36387 3.82786 7.35845 3.71186C7.35302 3.59585 7.42553 3.50835 7.57054 3.33337C8.62524 2.06068 10.2179 1.25 12 1.25Z" fill="#F4F6FC"/>
+<path d="M19.7778 10.25C19.2408 10.25 18.8056 10.6805 18.8056 11.2115C18.8056 12.2201 18.5813 13.1769 18.1793 14.0357C18.0828 14.2418 18.0346 14.3448 18.051 14.4381C18.0674 14.5314 18.1428 14.6068 18.2935 14.7575L18.8612 15.3252C19.1075 15.5715 19.2306 15.6946 19.3804 15.672C19.5303 15.6493 19.6077 15.5026 19.7626 15.209C20.3934 14.0133 20.75 12.6536 20.75 11.2115C20.75 10.6805 20.3147 10.25 19.7778 10.25Z" fill="#F4F6FC"/>
+</svg>
diff --git a/assets/images/calling/mic_enable.svg b/assets/images/calling/mic_enable.svg
new file mode 100644
index 00000000..8d32e34c
--- /dev/null
+++ b/assets/images/calling/mic_enable.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 1.25C8.82436 1.25 6.25 3.82436 6.25 7V11C6.25 14.1756 8.82436 16.75 12 16.75C15.1756 16.75 17.75 14.1756 17.75 11V7C17.75 3.82436 15.1756 1.25 12 1.25Z" fill="#F4F6FC"/>
+<path d="M5.19444 11.2115C5.19444 10.6805 4.75917 10.25 4.22222 10.25C3.68528 10.25 3.25 10.6805 3.25 11.2115C3.25 15.6659 6.65283 19.3343 11.0278 19.8126V20.8269H9.08333C8.54639 20.8269 8.11111 21.2574 8.11111 21.7885C8.11111 22.3195 8.54639 22.75 9.08333 22.75H14.9167C15.4536 22.75 15.8889 22.3195 15.8889 21.7885C15.8889 21.2574 15.4536 20.8269 14.9167 20.8269H12.9722V19.8126C17.3472 19.3343 20.75 15.6659 20.75 11.2115C20.75 10.6805 20.3147 10.25 19.7778 10.25C19.2408 10.25 18.8056 10.6805 18.8056 11.2115C18.8056 14.9288 15.7586 17.9423 12 17.9423C8.2414 17.9423 5.19444 14.9288 5.19444 11.2115Z" fill="#F4F6FC"/>
+</svg>
diff --git a/assets/images/calling/speaker_enable.svg b/assets/images/calling/speaker_enable.svg
new file mode 100644
index 00000000..e038d929
--- /dev/null
+++ b/assets/images/calling/speaker_enable.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9916 3.9756C11.6784 3.44801 12.4957 3.01957 13.367 3.38808C14.2302 3.75318 14.5076 4.63267 14.6274 5.49785C14.7502 6.38459 14.7502 7.60557 14.7502 9.12365V14.8794C14.7502 16.3975 14.7502 17.6185 14.6274 18.5052C14.5076 19.3704 14.2302 20.2499 13.367 20.615C12.4957 20.9835 11.6784 20.5551 10.9916 20.0275C10.2892 19.488 9.3966 18.5765 8.34667 17.5044C7.80721 16.9536 7.44921 16.6873 7.08663 16.5374C6.72221 16.3868 6.27914 16.3229 5.50619 16.3229C4.83768 16.3229 4.23963 16.3229 3.78679 16.2758C3.31184 16.2265 2.87088 16.1191 2.47421 15.8485C1.7184 15.3328 1.42917 14.5777 1.31957 13.8838C1.23785 13.3663 1.24723 12.7981 1.25479 12.3405V11.6626C1.24723 11.205 1.23785 10.6368 1.31957 10.1193C1.42917 9.42536 1.7184 8.67029 2.47421 8.15462C2.87088 7.88398 3.31184 7.77657 3.78679 7.72723C4.23963 7.68019 4.83768 7.68021 5.50619 7.68023C6.27914 7.68023 6.72221 7.61628 7.08663 7.46563C7.44922 7.31574 7.80717 7.04954 8.34663 6.49869C9.39658 5.42656 10.2892 4.51511 10.9916 3.9756Z" fill="#F4F6FC"/>
+<path d="M16.3935 8.20504C16.8325 7.87003 17.4601 7.95439 17.7951 8.39347C18.5519 9.38539 19.0001 10.6418 19.0001 12.0001C19.0001 13.3583 18.5519 14.6147 17.7951 15.6066C17.4601 16.0457 16.8325 16.1301 16.3935 15.7951C15.9544 15.4601 15.87 14.8325 16.205 14.3935C16.699 13.746 17.0001 12.9149 17.0001 12.0001C17.0001 11.0852 16.699 10.2541 16.205 9.60664C15.87 9.16756 15.9544 8.54004 16.3935 8.20504Z" fill="#F4F6FC"/>
+<path d="M20.7376 6.32472C20.3646 5.91738 19.7321 5.8895 19.3247 6.26245C18.9174 6.63541 18.8895 7.26796 19.2625 7.6753C20.3608 8.87497 21 10.379 21 12C21 13.621 20.3608 15.125 19.2625 16.3247C18.8895 16.7321 18.9174 17.3646 19.3247 17.7376C19.7321 18.1105 20.3646 18.0826 20.7376 17.6753C22.1408 16.1427 23 14.1675 23 12C23 9.83247 22.1408 7.8573 20.7376 6.32472Z" fill="#F4F6FC"/>
+</svg>
diff --git a/assets/images/calling/toggle_camera.svg b/assets/images/calling/toggle_camera.svg
new file mode 100644
index 00000000..e3cb6c2d
--- /dev/null
+++ b/assets/images/calling/toggle_camera.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.6949 2.4068C18.0224 1.96211 18.6484 1.86712 19.0931 2.19463L19.0969 2.19747C19.1724 2.25451 19.3861 2.41593 19.5059 2.50946C19.7487 2.69891 20.0757 2.96119 20.4057 3.24769C20.7307 3.52987 21.0815 3.85522 21.3588 4.16915C21.4965 4.32497 21.6373 4.50157 21.7491 4.68699C21.8443 4.84496 22.0001 5.13899 22.0001 5.49983C22.0001 5.86068 21.8443 6.15473 21.7491 6.3127C21.6373 6.49811 21.4965 6.67471 21.3588 6.83053C21.0814 7.14446 20.7307 7.46981 20.4057 7.75198C20.0757 8.03847 19.7487 8.30076 19.5059 8.4902C19.3859 8.58389 19.1718 8.74556 19.0966 8.80235L19.0932 8.8049C18.6485 9.13241 18.0224 9.03753 17.6949 8.59283C17.565 8.41644 17.5015 8.21152 17.5 8.00803V6.49988H9.5C6.3286 6.49988 4 8.74755 4 11.9999C4 12.5522 3.55228 12.9999 3 12.9999C2.44772 12.9999 2 12.5522 2 11.9999C2 7.62227 5.24485 4.49988 9.5 4.49988H17.5V2.99982C17.4999 2.79363 17.5632 2.58556 17.6949 2.4068Z" fill="#F4F6FC"/>
+<path d="M22 11.9999C22 16.3775 18.7552 19.4999 14.5 19.4999H6.50005V20.9956C6.5011 21.2032 6.43777 21.4129 6.3052 21.5929C5.97769 22.0376 5.35169 22.1326 4.90699 21.8051L4.90343 21.8024C4.82806 21.7454 4.6141 21.5838 4.49415 21.4902C4.2514 21.3008 3.92436 21.0385 3.59439 20.752C3.26939 20.4699 2.91862 20.1445 2.64124 19.8306C2.50356 19.6748 2.36278 19.4982 2.251 19.3127C2.15577 19.1548 2 18.8607 2 18.4999C2 18.139 2.15578 17.845 2.25101 17.687C2.36278 17.5016 2.50356 17.325 2.64124 17.1692C2.91862 16.8553 3.26938 16.5299 3.59438 16.2477C3.92434 15.9612 4.25138 15.699 4.49412 15.5095C4.61412 15.4159 4.82805 15.2543 4.90333 15.1974L4.9068 15.1948C5.35149 14.8673 5.97765 14.9622 6.30517 15.4068C6.43683 15.5856 6.50021 15.7937 6.50005 15.9999V17.4999H14.5C17.6714 17.4999 20 15.2522 20 11.9999C20 11.4476 20.4477 10.9999 21 10.9999C21.5523 10.9999 22 11.4476 22 11.9999Z" fill="#F4F6FC"/>
+</svg>
diff --git a/assets/images/calling/video_call_icon.svg b/assets/images/calling/video_call_icon.svg
new file mode 100644
index 00000000..60a51f29
--- /dev/null
+++ b/assets/images/calling/video_call_icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.072 3H8.92797C7.33935 2.99997 6.04614 2.99995 5.02631 3.13706C3.96232 3.28011 3.04736 3.58869 2.31802 4.31802C1.58869 5.04736 1.28011 5.96232 1.13706 7.02631C0.999949 8.04614 0.999972 9.33928 1 10.9279V13.072C0.999972 14.6607 0.999949 15.9539 1.13706 16.9737C1.28011 18.0377 1.58869 18.9527 2.31802 19.682C3.04736 20.4113 3.96232 20.7199 5.02631 20.8629C6.04616 21.0001 7.33933 21 8.928 21H10.072C11.6607 21 12.9538 21.0001 13.9737 20.8629C15.0377 20.7199 15.9527 20.4113 16.682 19.682C17.3875 18.9764 17.6993 18.0972 17.8484 17.0773C18.3063 17.4374 18.7206 17.7408 19.0944 17.9666C19.7947 18.3896 20.6822 18.7439 21.5929 18.2925C22.4895 17.848 22.7673 16.9371 22.8829 16.1198C22.9991 15.2982 22.9991 14.1926 22.999 12.8645V11.1382C22.9991 9.81011 22.9991 8.70445 22.8829 7.88282C22.7673 7.06553 22.4895 6.15463 21.5929 5.71019C20.6822 5.25874 19.7947 5.61301 19.0944 6.03609C18.7207 6.26185 18.3066 6.56515 17.8488 6.92504C17.6998 5.90419 17.3881 5.02411 16.682 4.31802C15.9527 3.58869 15.0377 3.28011 13.9737 3.13706C12.9539 2.99995 11.6607 2.99997 10.072 3ZM17.9943 9.3825C18 9.86282 18 10.3777 18 10.928V13.072C18 13.6233 18 14.1391 17.9943 14.6201C18.9515 15.4089 19.6126 15.943 20.1285 16.2547C20.3999 16.4186 20.5637 16.4778 20.6531 16.4955C20.6728 16.4994 20.6863 16.5007 20.6942 16.5012L20.6994 16.5013L20.7027 16.5013L20.7047 16.5005C20.7067 16.4995 20.7082 16.4986 20.7092 16.4979C20.7103 16.4971 20.7108 16.4966 20.7108 16.4966C20.7136 16.4936 20.7286 16.4774 20.7499 16.4358C20.7977 16.3422 20.8567 16.1641 20.9026 15.8397C20.9966 15.1754 20.999 14.2135 20.999 12.7832V11.2194C20.999 9.78915 20.9966 8.82725 20.9026 8.16294C20.8567 7.83855 20.7977 7.66044 20.7499 7.56691C20.7286 7.52522 20.714 7.50949 20.7112 7.50653C20.7112 7.50653 20.709 7.50427 20.7047 7.50211L20.7032 7.50139C20.7032 7.50139 20.6982 7.5013 20.6942 7.5015C20.6863 7.50191 20.6728 7.50322 20.6531 7.50713C20.5637 7.52483 20.3999 7.58402 20.1285 7.74796C19.6126 8.05966 18.9515 8.59379 17.9943 9.3825ZM13 9.5C13 10.3284 12.3284 11 11.5 11C10.6716 11 10 10.3284 10 9.5C10 8.67157 10.6716 8 11.5 8C12.3284 8 13 8.67157 13 9.5Z" fill="#3B3D4A"/>
+</svg>
diff --git a/assets/images/calling/video_disable.svg b/assets/images/calling/video_disable.svg
new file mode 100644
index 00000000..ee07a8aa
--- /dev/null
+++ b/assets/images/calling/video_disable.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.70711 1.29289C2.31658 0.902369 1.68342 0.902369 1.29289 1.29289C0.902369 1.68342 0.902369 2.31658 1.29289 2.70711L2.80516 4.21938C2.69757 4.30332 2.59413 4.39465 2.4948 4.49398C1.81966 5.16912 1.52415 6.02253 1.38483 7.0588C1.24997 8.06188 1.24998 9.34083 1.25 10.9434V13.0549C1.24998 14.6575 1.24997 15.9365 1.38483 16.9396C1.52415 17.9758 1.81966 18.8293 2.4948 19.5044C3.16994 20.1795 4.02335 20.475 5.05961 20.6144C6.0627 20.7492 7.34165 20.7492 8.94424 20.7492H10.0558C11.6583 20.7492 12.9373 20.7492 13.9404 20.6144C14.9767 20.475 15.8301 20.1795 16.5052 19.5044C16.7838 19.2258 16.9978 18.9168 17.1628 18.5771L21.2929 22.7071C21.6834 23.0976 22.3166 23.0976 22.7071 22.7071C23.0976 22.3166 23.0976 21.6834 22.7071 21.2929L2.70711 1.29289Z" fill="white"/>
+<path d="M13.7062 5.11923C12.8353 5.00213 11.6772 5 9.99904 5H8.96752C8.43122 4.9829 8.00115 4.54335 8 4.00265C7.99882 3.45037 8.44558 3.0017 8.99787 3.00052L10.0711 3C11.6597 2.99997 12.9529 2.99994 13.9727 3.13706C15.0367 3.28011 15.9517 3.58869 16.681 4.31802C17.4103 5.04735 17.7189 5.96232 17.862 7.0263C17.8742 7.11687 17.8853 7.20959 17.8954 7.30449C18.3463 6.97574 18.7545 6.69858 19.1231 6.49173C19.8273 6.09659 20.6866 5.78411 21.5681 6.18995C22.4678 6.60419 22.762 7.47353 22.8824 8.26363C23.0002 9.03709 23.0001 10.073 23.0001 11.2982L23.0001 12.8993C23.0001 14.0331 23.0001 14.9981 22.9116 15.7394C22.8712 16.0774 22.8065 16.4355 22.6808 16.7737C22.2465 17.9425 20.3372 17.3376 20.8394 15.9064C20.8777 15.7971 20.9057 15.6698 20.9257 15.5022C20.9983 14.8939 21.0001 14.0493 21.0001 12.8357V11.3832C21.0001 10.0499 20.9972 9.16915 20.9052 8.56474C20.8606 8.27197 20.8048 8.12186 20.7653 8.05005C20.7565 8.03415 20.7496 8.0241 20.7453 8.01834L20.7414 8.01344L20.7384 8.01018L20.7371 8.00939L20.7349 8.00824L20.7316 8.00663C20.7285 8.00465 20.7123 7.99436 20.6408 8.00751C20.5417 8.02573 20.3729 8.08381 20.1018 8.2359C19.5905 8.52282 18.9376 9.01181 17.9965 9.73188C17.9991 10.1102 17.999 10.5087 17.999 10.9278V12C17.999 12.5523 17.5513 13 16.999 13C16.4467 13 15.999 12.5523 15.999 12L15.999 11C15.999 9.32182 15.9969 8.16377 15.8798 7.2928C15.7666 6.45059 15.5626 6.02803 15.2668 5.73223C14.971 5.43644 14.5485 5.23246 13.7062 5.11923Z" fill="white"/>
+<path d="M8.96889 5.00004L8.93871 5.00002C8.91327 5 8.90978 5 8.96752 5L8.96889 5.00004Z" fill="white"/>
+<path d="M9.00213 5.00052C9.13771 5.00023 9.0365 5.0001 8.96889 5.00004C8.97993 5.00038 8.99101 5.00054 9.00213 5.00052Z" fill="white"/>
+</svg>
diff --git a/assets/images/calling/video_enable.svg b/assets/images/calling/video_enable.svg
new file mode 100644
index 00000000..9d5edc6a
--- /dev/null
+++ b/assets/images/calling/video_enable.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.072 3H8.92797C7.33935 2.99997 6.04614 2.99995 5.02631 3.13706C3.96232 3.28011 3.04736 3.58869 2.31802 4.31802C1.58869 5.04736 1.28011 5.96232 1.13706 7.02631C0.999949 8.04614 0.999972 9.33928 1 10.9279V13.072C0.999972 14.6607 0.999949 15.9539 1.13706 16.9737C1.28011 18.0377 1.58869 18.9527 2.31802 19.682C3.04736 20.4113 3.96232 20.7199 5.02631 20.8629C6.04616 21.0001 7.33933 21 8.928 21H10.072C11.6607 21 12.9538 21.0001 13.9737 20.8629C15.0377 20.7199 15.9527 20.4113 16.682 19.682C17.3875 18.9764 17.6993 18.0972 17.8484 17.0773C18.3063 17.4374 18.7206 17.7408 19.0944 17.9666C19.7947 18.3896 20.6822 18.7439 21.5929 18.2925C22.4895 17.848 22.7673 16.9371 22.8829 16.1198C22.9991 15.2982 22.9991 14.1926 22.999 12.8645V11.1382C22.9991 9.81011 22.9991 8.70445 22.8829 7.88282C22.7673 7.06553 22.4895 6.15463 21.5929 5.71019C20.6822 5.25874 19.7947 5.61301 19.0944 6.03609C18.7207 6.26185 18.3066 6.56515 17.8488 6.92504C17.6998 5.90419 17.3881 5.02411 16.682 4.31802C15.9527 3.58869 15.0377 3.28011 13.9737 3.13706C12.9539 2.99995 11.6607 2.99997 10.072 3ZM17.9943 9.3825C18 9.86282 18 10.3777 18 10.928V13.072C18 13.6233 18 14.1391 17.9943 14.6201C18.9515 15.4089 19.6126 15.943 20.1285 16.2547C20.3999 16.4186 20.5637 16.4778 20.6531 16.4955C20.6728 16.4994 20.6863 16.5007 20.6942 16.5012L20.6994 16.5013L20.7027 16.5013L20.7047 16.5005C20.7067 16.4995 20.7082 16.4986 20.7092 16.4979C20.7103 16.4971 20.7108 16.4966 20.7108 16.4966C20.7136 16.4936 20.7286 16.4774 20.7499 16.4358C20.7977 16.3422 20.8567 16.1641 20.9026 15.8397C20.9966 15.1754 20.999 14.2135 20.999 12.7832V11.2194C20.999 9.78915 20.9966 8.82725 20.9026 8.16294C20.8567 7.83855 20.7977 7.66044 20.7499 7.56691C20.7286 7.52522 20.714 7.50949 20.7112 7.50653C20.7112 7.50653 20.709 7.50427 20.7047 7.50211L20.7032 7.50139C20.7032 7.50139 20.6982 7.5013 20.6942 7.5015C20.6863 7.50191 20.6728 7.50322 20.6531 7.50713C20.5637 7.52483 20.3999 7.58402 20.1285 7.74796C19.6126 8.05966 18.9515 8.59379 17.9943 9.3825ZM13 9.5C13 10.3284 12.3284 11 11.5 11C10.6716 11 10 10.3284 10 9.5C10 8.67157 10.6716 8 11.5 8C12.3284 8 13 8.67157 13 9.5Z" fill="#F4F6FC"/>
+</svg>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 8792c07d..2bccb48c 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -66,6 +66,8 @@
 	<array>
 		<string>fetch</string>
 		<string>remote-notification</string>
+		<string>voip</string>
+		<string>processing</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart
index aee664aa..7499b34a 100644
--- a/lib/controllers/api_routes/urls.dart
+++ b/lib/controllers/api_routes/urls.dart
@@ -3,12 +3,12 @@ class URLs {
 
   static const String appReleaseBuildNumber = "48";
 
-  static const host1 = "https://atomsm.hmg.com"; // production url
+  // static const host1 = "https://atomsm.hmg.com"; // production url
   // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
-  // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
+  static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
 
-  static final String _baseUrl = "$_host/mobile"; // host local UAT
-  // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
+  // static final String _baseUrl = "$_host/mobile"; // host local UAT
+  static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
   // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
   // static final String _baseUrl = "$_host/v4/mobile"; // v4 for Demo module
   // static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation
diff --git a/lib/controllers/notification/firebase_notification_manger.dart b/lib/controllers/notification/firebase_notification_manger.dart
index 9866be33..533e4941 100644
--- a/lib/controllers/notification/firebase_notification_manger.dart
+++ b/lib/controllers/notification/firebase_notification_manger.dart
@@ -4,6 +4,11 @@ import 'dart:io';
 
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_callkit_incoming/entities/android_params.dart';
+import 'package:flutter_callkit_incoming/entities/call_kit_params.dart';
+import 'package:flutter_callkit_incoming/entities/ios_params.dart';
+import 'package:flutter_callkit_incoming/entities/notification_params.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 import 'package:google_api_availability/google_api_availability.dart';
 import 'package:huawei_push/huawei_push.dart' as h_push;
 import 'package:test_sa/controllers/notification/notification_manger.dart';
@@ -20,7 +25,11 @@ import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 
 @pragma('vm:entry-point')
-Future<void> firebaseMessagingBackgroundHandler(RemoteMessage message) async {}
+Future<void> firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  if (message.notification == null && message.data != null) {
+    handleDataMessage(message.data);
+  }
+}
 
 class FirebaseNotificationManger {
   static FirebaseMessaging messaging = FirebaseMessaging.instance;
@@ -250,12 +259,16 @@ class FirebaseNotificationManger {
     });
 
     FirebaseMessaging.onMessage.listen((RemoteMessage message) {
+      print("onMessage:${message.toMap()}");
       if (Platform.isAndroid) {
         if (message.data["notificationType"] != 'NurseConfirmArrive') {
           NotificationManger.showNotification(
               title: message.notification?.title ?? "", subtext: message.notification?.body ?? "", hashcode: int.tryParse("1234" ?? "") ?? 1, payload: json.encode(message.data), context: context);
         }
       }
+      if (message.notification == null && message.data != null) {
+        handleDataMessage(message.data);
+      }
       return;
     });
     FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
@@ -264,3 +277,110 @@ class FirebaseNotificationManger {
     FirebaseMessaging.onBackgroundMessage(firebaseMessagingBackgroundHandler);
   }
 }
+
+Future<void> handleDataMessage(Map<String, dynamic> messageData) async {
+  print("handleDataMessage:${messageData}");
+  // if (messageData["data"] != null) {
+  //   messageData = messageData["data"];
+  // } else {
+  //   return;
+  // }
+  if (messageData["type"] != null && messageData["type"] == "incoming_call") {
+// if (notificationType == 'incoming_call' || transactionType == 'call') {
+// CRITICAL FIX: Show CallKit UI in foreground just like background
+    final callId = messageData['callId'] as String? ?? messageData['sessionId'] as String? ?? DateTime.now().millisecondsSinceEpoch.toString();
+
+    final callerId = messageData['callerId'] as String? ?? messageData['callerEmployeeNumber'] as String? ?? messageData['sourceUserId'] as String? ?? 'unknown';
+
+    final callerName = messageData['callerName'] as String? ?? messageData['callerUserName'] as String? ?? messageData['userName'] as String? ?? 'Unknown Caller';
+
+    final callerEmployeeNumber = messageData['callerEmployeeNumber'] as String? ?? callerId;
+    final calleeEmployeeNumber = messageData['calleeEmployeeNumber'] as String? ?? callerId;
+
+    final isVideoCall = () {
+      final value = messageData['isVideoCall'];
+      if (value is bool) return value;
+      if (value is String) return value.toLowerCase() == 'true';
+      if (messageData['callType'] == 'video') return true;
+      return false;
+    }();
+
+    final moduleId = messageData['moduleId'] as String? ?? messageData['applicationId']?.toString();
+    final referenceId = messageData['referenceId'] as String?;
+    final conversationId = messageData['conversationId'] as String?;
+
+    log('📱 [FOREGROUND] Showing CallKit UI...', name: 'FirebaseNotificationManger');
+
+// Show CallKit UI using CallKitService
+    try {
+      final callKitParams = CallKitParams(
+        id: callId,
+        nameCaller: callerName,
+        appName: 'ATOMS',
+        avatar: '',
+        handle: callerEmployeeNumber,
+        type: isVideoCall ? 1 : 0,
+        duration: 30000,
+        missedCallNotification: const NotificationParams(
+          showNotification: true,
+          isShowCallback: true,
+          subtitle: 'Missed call',
+          callbackText: 'Call back',
+        ),
+        extra: {
+          'callId': callId,
+          'callerId': callerId,
+          'callerEmployeeNumber': callerEmployeeNumber,
+          'calleeEmployeeNumber': calleeEmployeeNumber,
+          'callerName': callerName,
+          'moduleId': moduleId ?? '',
+          'referenceId': referenceId ?? '',
+          'conversationId': conversationId ?? '',
+          'isVideoCall': isVideoCall,
+          'timestamp': DateTime.now().toIso8601String(),
+        },
+        android: const AndroidParams(
+          isCustomNotification: true,
+          isShowLogo: false,
+          ringtonePath: 'system_ringtone_default',
+          backgroundColor: '#0955fa',
+          backgroundUrl: '',
+          actionColor: '#4CAF50',
+          textColor: '#ffffff',
+          incomingCallNotificationChannelName: 'Incoming Calls',
+          missedCallNotificationChannelName: 'Missed Calls',
+        ),
+        ios: const IOSParams(
+          iconName: 'CallKitLogo',
+          handleType: 'generic',
+          supportsVideo: true,
+          maximumCallGroups: 1,
+          maximumCallsPerCallGroup: 1,
+          audioSessionMode: 'default',
+          audioSessionActive: true,
+          audioSessionPreferredSampleRate: 44100.0,
+          audioSessionPreferredIOBufferDuration: 0.005,
+          supportsDTMF: true,
+          supportsHolding: false,
+          supportsGrouping: false,
+          supportsUngrouping: false,
+          ringtonePath: 'system_ringtone_default',
+        ),
+      );
+      // await FlutterCallkitIncoming.requestNotificationPermission({
+      //   "title": "Notification permission",
+      //   "rationaleMessagePermission": "Notification permission is required, to show notification.",
+      //   "postNotificationMessageRequired": "Notification permission is required, Please allow notification permission from setting."
+      // });
+      // Check if can use full screen intent
+      await FlutterCallkitIncoming.canUseFullScreenIntent();
+
+// Request full intent permission
+      await FlutterCallkitIncoming.requestFullIntentPermission();
+      FlutterCallkitIncoming.showCallkitIncoming(callKitParams);
+      log('✅ [FOREGROUND] CallKit UI displayed successfully', name: 'FirebaseNotificationManger');
+    } catch (e, stackTrace) {
+      log('❌ [FOREGROUND] Failed to show CallKit UI: $e\nStack: $stackTrace', name: 'FirebaseNotificationManger');
+    }
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
index 5c154b24..d00c45a5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -35,6 +35,7 @@ import 'package:test_sa/modules/asset_delivery_module/provider/power_supply_type
 import 'package:test_sa/modules/asset_inventory_module/provider/asset_inventory_provider.dart';
 import 'package:test_sa/modules/cm_module/cm_detail_provider.dart';
 import 'package:test_sa/modules/cm_module/create_cm_request.dart';
+import 'package:test_sa/modules/cx_module/chat/calling/call_provider.dart';
 import 'package:test_sa/modules/cx_module/chat/chat_provider.dart';
 import 'package:test_sa/modules/demo_module/create_demo_request_page.dart';
 import 'package:test_sa/modules/demo_module/provider/demo_period_lookup_provider.dart';
@@ -364,6 +365,7 @@ class MyApp extends StatelessWidget {
 
         // UTILITY PROVIDERS (1)
         ChangeNotifierProvider(create: (_) => OracleCodeProvider(), lazy: true),
+        ChangeNotifierProvider(create: (_) => CallProvider(), lazy: true),
       ],
       child: GestureDetector(
         onTap: () {
diff --git a/lib/modules/cx_module/chat/calling/audio_call_page.dart b/lib/modules/cx_module/chat/calling/audio_call_page.dart
new file mode 100644
index 00000000..d061d914
--- /dev/null
+++ b/lib/modules/cx_module/chat/calling/audio_call_page.dart
@@ -0,0 +1,174 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:test_sa/extensions/int_extensions.dart';
+import 'package:test_sa/extensions/text_extensions.dart';
+import 'package:test_sa/extensions/widget_extensions.dart';
+import 'package:test_sa/modules/cx_module/chat/model/chat_participant_model.dart';
+import 'package:test_sa/new_views/app_style/app_color.dart';
+import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
+
+import '../chat_provider.dart';
+import 'call_provider.dart';
+
+class AudioCallPage extends StatefulWidget {
+  Participants sender;
+  Participants recipient;
+
+  AudioCallPage({Key? key, required this.sender, required this.recipient}) : super(key: key);
+
+  @override
+  _AudioCallPageState createState() {
+    return _AudioCallPageState();
+  }
+}
+
+class _AudioCallPageState extends State<AudioCallPage> {
+  late CallProvider callPro;
+  late ChatProvider chatProvider;
+  // Participants? participants;
+
+  String currentStatus = "Connecting...";
+
+  @override
+  void initState() {
+    super.initState();
+    callPro = Provider.of<CallProvider>(context, listen: false);
+    chatProvider = Provider.of<ChatProvider>(context, listen: false);
+    // participants = chatProvider.recipient;
+    makeCall();
+  }
+
+  void makeCall() async {
+    callPro.initAudioCallListeners();
+    callPro.startCall(widget.sender.employeeNumber ?? "", widget.recipient?.employeeNumber ?? "", false, chatProvider.moduleID, chatProvider.referenceID);
+
+    Map<String, dynamic> json = {
+      // "callerID": AppState().chatDetails!.response!.id!.toString(),
+      // "callerDetails": AppState().chatDetails!.toJson(),
+      // "receiverID": params!.chatUser!.id.toString(),
+      // "receiverDetails": params!.chatUser!.toJson(),
+      // "title": params!.chatUser!.userName!.replaceAll(".", " "),
+      // "calltype": widget.isAudio ? "Audio" : "Video",
+    };
+
+    // CallDataModel callData = CallDataModel.fromJson(json);
+    // await Navigator.push(
+    //   context,
+    //   MaterialPageRoute(
+    //     builder: (BuildContext context) => OutGoingCall(
+    //       isVideoCall: callType == "VIDEO" ? true : false,
+    //       outGoingCallData: callData,
+    //     ),
+    //   ),
+    // ).then((value) {
+    //   print("then");
+    //   callPro.stopListeners();
+    // });
+  }
+
+  @override
+  void dispose() {
+    callPro.stopListeners();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Stack(
+        children: [
+          Container(
+            width: double.infinity,
+            height: double.infinity,
+            decoration: const BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: [
+                  Color(0xFF202641), // top edge (y ≈ 0%)
+                  Color(0xFF283859), // (y ≈ 8%)
+                  Color(0xFF335073), // (y ≈ 15%)
+                  Color(0xFF425E7A), // (y ≈ 23%)
+                  Color(0xFF4A637D), // peak glow, behind avatar (y ≈ 27%)
+                  Color(0xFF39495F), // (y ≈ 34%)
+                  Color(0xFF1A2032), // fading to dark (y ≈ 42%)
+                  Color(0xFF121426), // flat dark section (y ≈ 51%–70%)
+                  Color(0xFF121426),
+                  Color(0xFF25283A), // slight rise near bottom (y ≈ 89%)
+                  Color(0xFF383D4D), // bottom edge (y ≈ 97%)
+                ],
+                stops: [0.0, 0.08, 0.15, 0.23, 0.27, 0.34, 0.42, 0.51, 0.70, 0.89, 0.97],
+              ),
+            ),
+            // child: /* your call screen content */,
+          ),
+          // Container(
+          //   decoration: const BoxDecoration(
+          //     gradient: LinearGradient(
+          //       begin: Alignment.topCenter,
+          //       end: Alignment.bottomCenter,
+          //       colors: [
+          //         Color(0xFF33475F), // top - soft blue glow
+          //         Color(0xFF1A2233), // mid transition
+          //         Color(0xFF0D0F14), // bottom - near black
+          //       ],
+          //       stops: [0.0, 0.35, 1.0],
+          //     ),
+          //   ),
+          // ),
+          SafeArea(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    callButton("calling/call_user_avatar", () {}, size: 85),
+                    24.height,
+                    InfoTextLabelWidget(label: chatProvider.recipient?.userName ?? "", textStyle: AppTextStyles.heading4.copyWith(fontWeight: FontWeight.w600), color: Colors.white),
+                    4.height,
+                    InfoTextLabelWidget(label: currentStatus, textStyle: AppTextStyles.heading6, color: Colors.white)
+                  ],
+                ),
+                const Spacer(),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    callButton("calling/mic_enable", () {
+                      callPro.toggleMute();
+                    }),
+                    callButton("calling/end_call", () async {
+                      callPro.endCall();
+                      Navigator.pop(context);
+                    }, isEndCall: true, size: 68),
+                    callButton("calling/speaker_enable", () {}),
+                  ],
+                )
+              ],
+            ).paddingOnly(start: 24, end: 24, top: 120, bottom: 100),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget callButton(String icon, VoidCallback onTap, {bool isEndCall = false, bool isSelected = false, double size = 52}) {
+    return (isEndCall
+            ? Container(
+                height: size,
+                width: size,
+                padding: const EdgeInsets.all(18),
+                decoration: const BoxDecoration(color: AppColor.red30, shape: BoxShape.circle),
+                child: icon.toSvgAsset(height: 24, width: 24, color: Colors.white),
+              )
+            : Container(
+                height: size,
+                width: size,
+                padding: const EdgeInsets.all(12),
+                decoration:
+                    BoxDecoration(color: isSelected ? AppColor.primary10 : const Color(0xff414352), shape: BoxShape.circle, border: Border.all(color: Colors.white.withValues(alpha: .2), width: 1)),
+                child: icon.toSvgAsset(height: 24, width: 24, color: Colors.white),
+              ))
+        .onPress(onTap);
+  }
+}
diff --git a/lib/modules/cx_module/chat/calling/call_data_model.dart b/lib/modules/cx_module/chat/calling/call_data_model.dart
new file mode 100644
index 00000000..6c0f11bb
--- /dev/null
+++ b/lib/modules/cx_module/chat/calling/call_data_model.dart
@@ -0,0 +1,197 @@
+// To parse this JSON data, do
+//
+//     final callDataModel = callDataModelFromJson(jsonString);
+
+import 'dart:convert';
+
+class CallDataModel {
+  CallDataModel({
+    this.callerId,
+    this.callerDetails,
+    this.receiverId,
+    this.receiverDetails,
+    this.title,
+    this.calltype,
+  });
+
+  String? callerId;
+  CallerDetails? callerDetails;
+  String? receiverId;
+  ReceiverDetails? receiverDetails;
+  dynamic title;
+  String? calltype;
+
+  factory CallDataModel.fromRawJson(String str) => CallDataModel.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory CallDataModel.fromJson(Map<String, dynamic> json) => CallDataModel(
+        callerId: json["callerID"],
+        callerDetails: json["callerDetails"] == null ? null : CallerDetails.fromJson(json["callerDetails"]),
+        receiverId: json["receiverID"],
+        receiverDetails: json["receiverDetails"] == null ? null : ReceiverDetails.fromJson(json["receiverDetails"]),
+        title: json["title"],
+        calltype: json["calltype"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "callerID": callerId,
+        "callerDetails": callerDetails?.toJson(),
+        "receiverID": receiverId,
+        "receiverDetails": receiverDetails?.toJson(),
+        "title": title,
+        "calltype": calltype,
+      };
+}
+
+class CallerDetails {
+  CallerDetails({
+    this.response,
+    this.errorResponses,
+  });
+
+  Response? response;
+  dynamic errorResponses;
+
+  factory CallerDetails.fromRawJson(String str) => CallerDetails.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory CallerDetails.fromJson(Map<String, dynamic> json) => CallerDetails(
+        response: json["response"] == null ? null : Response.fromJson(json["response"]),
+        errorResponses: json["errorResponses"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "response": response?.toJson(),
+        "errorResponses": errorResponses,
+      };
+}
+
+class Response {
+  Response({
+    this.id,
+    this.userName,
+    this.email,
+    this.phone,
+    this.title,
+    this.token,
+    this.isDomainUser,
+    this.isActiveCode,
+    this.encryptedUserId,
+    this.encryptedUserName,
+  });
+
+  int? id;
+  String? userName;
+  String? email;
+  dynamic phone;
+  String? title;
+  String? token;
+  bool? isDomainUser;
+  bool? isActiveCode;
+  String? encryptedUserId;
+  String? encryptedUserName;
+
+  factory Response.fromRawJson(String str) => Response.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory Response.fromJson(Map<String, dynamic> json) => Response(
+        id: json["id"],
+        userName: json["userName"],
+        email: json["email"],
+        phone: json["phone"],
+        title: json["title"],
+        token: json["token"],
+        isDomainUser: json["isDomainUser"],
+        isActiveCode: json["isActiveCode"],
+        encryptedUserId: json["encryptedUserId"],
+        encryptedUserName: json["encryptedUserName"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "id": id,
+        "userName": userName,
+        "email": email,
+        "phone": phone,
+        "title": title,
+        "token": token,
+        "isDomainUser": isDomainUser,
+        "isActiveCode": isActiveCode,
+        "encryptedUserId": encryptedUserId,
+        "encryptedUserName": encryptedUserName,
+      };
+}
+
+class ReceiverDetails {
+  ReceiverDetails({
+    this.id,
+    this.userName,
+    this.email,
+    this.phone,
+    this.title,
+    this.userStatus,
+    this.image,
+    this.unreadMessageCount,
+    this.userAction,
+    this.isPin,
+    this.isFav,
+    this.isAdmin,
+    this.rKey,
+    this.totalCount,
+  });
+
+  int? id;
+  String? userName;
+  String? email;
+  dynamic phone;
+  dynamic title;
+  int? userStatus;
+  String? image;
+  int? unreadMessageCount;
+  dynamic userAction;
+  bool? isPin;
+  bool? isFav;
+  bool? isAdmin;
+  String? rKey;
+  int? totalCount;
+
+  factory ReceiverDetails.fromRawJson(String str) => ReceiverDetails.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory ReceiverDetails.fromJson(Map<String, dynamic> json) => ReceiverDetails(
+        id: json["id"],
+        userName: json["userName"],
+        email: json["email"],
+        phone: json["phone"],
+        title: json["title"],
+        userStatus: json["userStatus"],
+        image: json["image"],
+        unreadMessageCount: json["unreadMessageCount"],
+        userAction: json["userAction"],
+        isPin: json["isPin"],
+        isFav: json["isFav"],
+        isAdmin: json["isAdmin"],
+        rKey: json["rKey"],
+        totalCount: json["totalCount"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "id": id,
+        "userName": userName,
+        "email": email,
+        "phone": phone,
+        "title": title,
+        "userStatus": userStatus,
+        "image": image,
+        "unreadMessageCount": unreadMessageCount,
+        "userAction": userAction,
+        "isPin": isPin,
+        "isFav": isFav,
+        "isAdmin": isAdmin,
+        "rKey": rKey,
+        "totalCount": totalCount,
+      };
+}
diff --git a/lib/modules/cx_module/chat/calling/call_page.dart b/lib/modules/cx_module/chat/calling/call_page.dart
new file mode 100644
index 00000000..a1cf0d40
--- /dev/null
+++ b/lib/modules/cx_module/chat/calling/call_page.dart
@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:test_sa/modules/cx_module/chat/model/chat_participant_model.dart';
+
+import '../chat_provider.dart';
+import 'call_provider.dart';
+
+class CallPage extends StatefulWidget {
+  Participants? participants;
+  bool isAudio;
+
+  CallPage({Key? key, this.participants, this.isAudio = true}) : super(key: key);
+
+  @override
+  _CallPageState createState() {
+    return _CallPageState();
+  }
+}
+
+class _CallPageState extends State<CallPage> {
+  late CallProvider callPro;
+  late ChatProvider chatProvider;
+  // Participants? participants;
+
+  @override
+  void initState() {
+    super.initState();
+    callPro = Provider.of<CallProvider>(context, listen: false);
+    chatProvider = Provider.of<ChatProvider>(context, listen: false);
+    // participants = chatProvider.recipient;
+
+    makeCall();
+  }
+
+  void makeCall() async {
+    callPro.initCallListeners();
+    print("================== Make call Triggered ============================");
+    Map<String, dynamic> json = {
+      // "callerID": AppState().chatDetails!.response!.id!.toString(),
+      // "callerDetails": AppState().chatDetails!.toJson(),
+      // "receiverID": params!.chatUser!.id.toString(),
+      // "receiverDetails": params!.chatUser!.toJson(),
+      // "title": params!.chatUser!.userName!.replaceAll(".", " "),
+      // "calltype": widget.isAudio ? "Audio" : "Video",
+    };
+
+    // callPro.startCall(chatProvider.sender?.employeeNumber ?? "", chatProvider.recipient?.employeeNumber ?? "", false,);
+
+    // CallDataModel callData = CallDataModel.fromJson(json);
+    // await Navigator.push(
+    //   context,
+    //   MaterialPageRoute(
+    //     builder: (BuildContext context) => OutGoingCall(
+    //       isVideoCall: callType == "VIDEO" ? true : false,
+    //       outGoingCallData: callData,
+    //     ),
+    //   ),
+    // ).then((value) {
+    //   print("then");
+    //   callPro.stopListeners();
+    // });
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold();
+  }
+}
diff --git a/lib/modules/cx_module/chat/calling/call_provider.dart b/lib/modules/cx_module/chat/calling/call_provider.dart
new file mode 100644
index 00000000..ed5607ce
--- /dev/null
+++ b/lib/modules/cx_module/chat/calling/call_provider.dart
@@ -0,0 +1,352 @@
+import 'dart:convert';
+import 'dart:ui';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_webrtc/flutter_webrtc.dart';
+import 'package:signalr_netcore/http_connection_options.dart';
+import 'package:signalr_netcore/hub_connection.dart';
+import 'package:signalr_netcore/hub_connection_builder.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+
+import '../chat_provider.dart';
+
+class CallProvider with ChangeNotifier, DiagnosticableTreeMixin {
+  ///////////////////// Web RTC Video Calling //////////////////////
+  // Video Call
+  late RTCPeerConnection _peerConnection;
+  RTCVideoRenderer _localVideoRenderer = RTCVideoRenderer();
+  final RTCVideoRenderer _remoteRenderer = RTCVideoRenderer();
+
+  MediaStream? _localStream;
+  MediaStream? _remoteStream;
+
+  bool isMuted = false;
+  bool isSpeakerOn = false;
+  bool isCameraOn = true;
+  bool isPeerMuted = false;
+  bool isPeerCameraOn = true;
+
+  Future<void> _disposeConnection() async {
+    try {
+      if (chatHubConnection != null) {
+        await chatHubConnection!.stop();
+        if (kDebugMode) {
+          print('🔌 SignalR connection closed successfully');
+        }
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('⚠️ Error closing SignalR connection: $e');
+      }
+    } finally {
+      chatHubConnection = null;
+    }
+  }
+
+  @override
+  void dispose() {
+    _disposeConnection().then((_) {
+      if (kDebugMode) {
+        print('✅ ChatProvider disposed');
+      }
+    }).catchError((error) {
+      if (kDebugMode) {
+        print('⚠️ Error during ChatProvider disposal: $error');
+      }
+    });
+    super.dispose();
+  }
+
+  Future<HubConnection> getHubConnection() async {
+    if (kDebugMode) {
+      print('🔧 Creating new SignalR hub connection...');
+    }
+
+    HubConnection hub;
+    HttpConnectionOptions httpOp = HttpConnectionOptions(skipNegotiation: false, logMessageContent: true);
+    hub = HubConnectionBuilder().withUrl("${URLs.chatHubUrlChat}?accessTokenFactory=${URLs.chatApiKey}", options: httpOp).withAutomaticReconnect(retryDelays: <int>[2000, 5000, 10000, 20000]).build();
+
+    if (kDebugMode) {
+      print('✅ SignalR hub connection created');
+    }
+
+    return hub;
+  }
+
+  Future<bool> buildHubConnection() async {
+    try {
+      // Dispose existing connection if any
+      await _disposeConnection();
+
+      chatHubConnection = await getHubConnection();
+      await chatHubConnection!.start();
+      if (kDebugMode) {
+        print("🔌 SignalR Hub Connection: Started");
+      }
+      return true;
+
+      //group On message
+
+      // chatHubConnection.on("OnDeliveredGroupChatHistoryAsync", onGroupMsgReceived);
+    } catch (e) {
+      if (kDebugMode) {
+        print('⚠️ Error building SignalR connection: $e');
+      }
+      // Clean up on error
+      await _disposeConnection();
+      return false;
+      rethrow; // Rethrow so caller knows about the error
+    }
+  }
+
+  void initAudioCallListeners() {
+    chatHubConnection!.on("OnCallAcceptedAsync", onCallAcceptedAsync);
+    chatHubConnection!.on("OnIceCandidateAsync", onIceCandidateAsync);
+    chatHubConnection!.on("OnOfferAsync", onOfferAsync);
+    chatHubConnection!.on("OnAnswerOffer", onAnswerOffer);
+    chatHubConnection!.on("OnHangUpAsync", onHangUpAsync);
+    chatHubConnection!.on("OnCallDeclinedAsync", onCallDeclinedAsync);
+    chatHubConnection!.on('OnAudioToggle', onAudioToggle);
+  }
+
+  void initCallListeners() {
+    chatHubConnection!.on("OnCallAcceptedAsync", onCallAcceptedAsync);
+    chatHubConnection!.on("OnIceCandidateAsync", onIceCandidateAsync);
+    chatHubConnection!.on("OnOfferAsync", onOfferAsync);
+    chatHubConnection!.on("OnAnswerOffer", onAnswerOffer);
+    chatHubConnection!.on("OnHangUpAsync", onHangUpAsync);
+    chatHubConnection!.on("OnCallDeclinedAsync", onCallDeclinedAsync);
+    chatHubConnection!.on('OnAudioToggle', onAudioToggle);
+    chatHubConnection!.on('OnCameraToggle', onCameraToggle);
+
+    // chatHubConnection!.on('OnIncomingCallAsync', onHandleIncomingCall);
+    // chatHubConnection!.on('OnCallAcceptedAsync', _handleCallAccepted);
+    // chatHubConnection!.on('OnCallDeclinedAsync', _handleCallDeclined);
+    // chatHubConnection!.on('OnHangUpAsync', onHangUpAsync);
+    // chatHubConnection!.on('OnOfferAsync', _handleOffer);
+    // chatHubConnection!.on('OnAnswerOfferAsync', onAnswerOffer);
+    // chatHubConnection!.on('OnIceCandidateAsync', _handleIceCandidate);
+    // chatHubConnection!.on('OnAudioToggle', _handleAudioToggle);
+    // chatHubConnection!.on('OnCameraToggle', _handleCameraToggle);
+    // chatHubConnection!.on('OnUserOnlineAsync', _handleUserOnline);
+    // chatHubConnection!.on('OnUserOfflineAsync', _handleUserOffline);
+    // chatHubConnection!.on('OnCallHistoryUpdated', _handleCallHistoryUpdated);
+    // chatHubConnection!.on('OnError', _handleError);
+  }
+
+  //Video Constraints
+  var videoConstraints = {
+    "video": {
+      "mandatory": {
+        "width": {"min": 320},
+        "height": {"min": 180}
+      },
+      "optional": [
+        {
+          "width": {"max": 1280}
+        },
+        {"frameRate": 25},
+        {"facingMode": "user"}
+      ]
+    },
+    "frameRate": 25,
+    "width": 420, //420,//640,//1280,
+    "height": 240 //240//480//720
+  };
+
+  // Audio Constraints
+  var audioConstraints = {
+    "sampleRate": 8000,
+    "sampleSize": 16,
+    "channelCount": 2,
+    "echoCancellation": true,
+    "audio": true,
+  };
+
+  Future<RTCPeerConnection> _createPeerConnection() async {
+    //  {"url": "stun:stun.l.google.com:19302"},
+    Map<String, dynamic> configuration = {
+      "iceServers": [
+        {"urls": 'stun:15.185.116.59:3478'},
+        {"urls": "turn:15.185.116.59:3479", "username": "admin", "credential": "admin"}
+      ]
+    };
+
+    Map<String, dynamic> offerSdpConstraints = {
+      "mandatory": {
+        "OfferToReceiveAudio": true,
+        "OfferToReceiveVideo": true,
+      },
+      "optional": [],
+    };
+
+    RTCPeerConnection pc = await createPeerConnection(configuration, offerSdpConstraints);
+    // if (pc != null) print(pc);
+    //pc.addStream(widget.localStream);
+
+    pc.onIceCandidate = (e) {
+      if (e.candidate != null) {
+        print(json.encode({
+          'candidate': e.candidate.toString(),
+          'sdpMid': e.sdpMid.toString(),
+          'sdpMlineIndex': e.sdpMLineIndex,
+        }));
+      }
+    };
+    pc.onIceConnectionState = (e) {
+      print(e);
+    };
+    pc.onAddStream = (stream) {
+      print('addStream: ' + stream.id);
+      _remoteRenderer.srcObject = stream;
+    };
+    return pc;
+  }
+
+  void init() {
+    initRenderers();
+    _createPeerConnection().then((pc) {
+      _peerConnection = pc;
+      // _setRemoteDescription(widget.info);
+    });
+  }
+
+  void initRenderers() {
+    _localVideoRenderer.initialize();
+    _remoteRenderer.initialize();
+    initLocalCamera();
+  }
+
+  void initLocalCamera() async {
+    _localStream = await navigator.mediaDevices.getUserMedia({'video': true, 'audio': true});
+    _localVideoRenderer.srcObject = _localStream;
+    // _localVideoRenderer.srcObject = await navigator.mediaDevices
+    //     .getUserMedia({'video': true, 'audio': true});
+    print('this source Object');
+    print('this suarce  ${_localVideoRenderer.srcObject != null}');
+    notifyListeners();
+  }
+
+  late String senderN;
+  late String recipientN;
+  late bool isVideo;
+  int? moduleId;
+  int? referenceID;
+
+  void startCall(String senderN, String recipientN, bool isVideo, int? moduleId, int? referenceID) async {
+    this.senderN = senderN;
+    this.recipientN = recipientN;
+    this.isVideo = isVideo;
+    this.moduleId = moduleId;
+    this.referenceID = referenceID;
+    invoke(invokeMethod: "CallUserAsync", currentUserID: senderN, targetUserID: recipientN, isVideoCall: isVideo);
+  }
+
+  void acceptCall(String senderN, String recipientN, bool isVideo, int moduleId, int? referenceID) async {
+    invoke(invokeMethod: "AnswerCallAsync", currentUserID: senderN, targetUserID: recipientN, isVideoCall: isVideo);
+  }
+
+  void declineCall(String senderN, String recipientN, bool isVideo, int moduleId, int? referenceID) async {
+    invoke(invokeMethod: "CallDeclinedAsync", currentUserID: senderN, targetUserID: recipientN, isVideoCall: isVideo);
+  }
+
+  void endCall() {
+    invoke(invokeMethod: "HangUpAsync", currentUserID: senderN, targetUserID: recipientN, data: moduleId);
+  }
+
+  void toggleMute() {
+    invoke(invokeMethod: "AudioToggle", currentUserID: senderN, targetUserID: recipientN, isVideoCall: isVideo);
+  }
+
+  void checkCall(Map<String, dynamic> message) {
+    switch (message["callStatus"]) {
+      case 'connected':
+        {}
+        break;
+      case 'offer':
+        {}
+        break;
+      case 'accept':
+        {}
+        break;
+      case 'candidate':
+        {}
+        break;
+      case 'bye':
+        {}
+        break;
+      case 'leave':
+        {}
+        break;
+    }
+  }
+
+  //// Listeners Methods ////
+
+  void onCallAcceptedAsync(List<Object?>? params) {
+    print("onCallAcceptedAsync: $params");
+  }
+
+  void onIceCandidateAsync(List<Object?>? params) {
+    print("onCallAcceptedAsync: $params");
+  }
+
+  void onOfferAsync(List<Object?>? params) {
+    print("onCallAcceptedAsync: $params");
+  }
+
+  void onAnswerOffer(List<Object?>? params) {
+    print("onAnswerOffer: $params");
+  }
+
+  void onHangUpAsync(List<Object?>? params) {
+    print("onHangUpAsync: $params");
+  }
+
+  void onCallDeclinedAsync(List<Object?>? params) {
+    print("onCallDeclinedAsync: $params");
+  }
+
+  void onAudioToggle(List<Object?>? params) {
+    print("onAudioToggle: $params");
+    isMuted = !isMuted;
+    notifyListeners();
+  }
+
+  void onCameraToggle(List<Object?>? params) {
+    print("onCameraToggle: $params");
+  }
+
+  //// Invoke Methods
+
+  Future<void> invoke({required String invokeMethod, required String currentUserID, required String targetUserID, bool isVideoCall = false, var data}) async {
+    List<Object> args = [];
+    if (invokeMethod == "answerCallAsync") {
+      args = [currentUserID, targetUserID];
+    } else if (invokeMethod == "CallUserAsync") {
+      args = [currentUserID, targetUserID, isVideoCall];
+    } else if (invokeMethod == "HangUpAsync ") {
+      args = [currentUserID, targetUserID, data];
+    } else if (invokeMethod == "AudioToggle") {
+      args = [currentUserID, targetUserID, isVideoCall];
+    } else if (invokeMethod == "IceCandidateAsync") {
+      args = [targetUserID, data];
+    } else if (invokeMethod == "OfferAsync") {
+      args = [targetUserID, data];
+    } else if (invokeMethod == "AnswerOfferAsync") {
+      args = [targetUserID, data];
+    }
+    await chatHubConnection!.invoke(invokeMethod, args: args);
+  }
+
+  void stopListeners() async {
+    chatHubConnection!.off('OnCallDeclinedAsync');
+    chatHubConnection!.off('OnCallAcceptedAsync');
+    chatHubConnection!.off('OnIceCandidateAsync');
+    chatHubConnection!.off('OnAnswerOffer');
+    chatHubConnection!.off('OnOfferAsync');
+    chatHubConnection!.off('OnHangUpAsync');
+    chatHubConnection!.off('OnAudioToggle');
+  }
+}
diff --git a/lib/modules/cx_module/chat/chat_page.dart b/lib/modules/cx_module/chat/chat_page.dart
index 6b0fbd37..53c0ce8a 100644
--- a/lib/modules/cx_module/chat/chat_page.dart
+++ b/lib/modules/cx_module/chat/chat_page.dart
@@ -6,6 +6,7 @@ import 'package:audio_waveforms/audio_waveforms.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart' as PermissionHandler;
 import 'package:provider/provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
@@ -16,14 +17,17 @@ import 'package:test_sa/helper/utils.dart';
 import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/modules/cm_module/cm_detail_provider.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
+import 'package:test_sa/modules/cx_module/chat/calling/call_page.dart';
 import 'package:test_sa/modules/cx_module/chat/chat_api_client.dart';
 import 'package:test_sa/modules/cx_module/chat/chat_provider.dart';
 import 'package:test_sa/modules/cx_module/chat/view_all_attachment_page.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
+import 'package:test_sa/views/widgets/dialogs/dialog.dart';
 import 'package:test_sa/views/widgets/sound/sound_player.dart';
 
+import 'calling/audio_call_page.dart';
 import 'helper/chat_audio_player.dart';
 import 'helper/chat_file_picker.dart';
 import 'helper/chat_file_viewer.dart';
@@ -195,10 +199,80 @@ class _ChatPageState extends State<ChatPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        // backgroundColor: AppColor.white10,
-        appBar: DefaultAppBar(title: widget.title),
-        // OPTIMIZATION: Using Selector for connection state (rarely changes)
-        // This prevents rebuilding entire chat UI on every message/typing event
+        appBar: DefaultAppBar(
+          title: widget.title,
+          actions: [
+            IconButton(
+              icon: "calling/audio_call_icon".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
+              padding: EdgeInsets.zero,
+              visualDensity: VisualDensity.compact,
+              tooltip: "Audio",
+              onPressed: () async {
+                bool audioPermission = await Provider.of<ChatProvider>(context, listen: false).checkAudioPermissions();
+                if (!audioPermission) {
+                  context.showConfirmDialog("To perform audio call, we need permission to access microphone.", title: "Permission Required", onTap: () async {
+                    Navigator.pop(context);
+                    audioPermission = await Provider.of<ChatProvider>(context, listen: false).requestAudioPermissions();
+                    if (!audioPermission) {
+                      bool openSetting = await showDialog(
+                        context: context,
+                        builder: (_) => const AAlertDialog(
+                          title: "Permission denied",
+                          content: "Permission is denied. Please go to application Setting to enable it.",
+                          button1Text: "Cancel",
+                          button2Text: "Open Setting",
+                        ),
+                      );
+                      if (!openSetting) PermissionHandler.openAppSettings();
+                      return;
+                    } else {
+                      Navigator.of(context).push(MaterialPageRoute(
+                          builder: (_) => AudioCallPage(
+                                sender: Provider.of<ChatProvider>(context, listen: false).sender!,
+                                recipient: Provider.of<ChatProvider>(context, listen: false).recipient!,
+                              )));
+                    }
+                  });
+                } else {
+                  Navigator.of(context).push(MaterialPageRoute(
+                      builder: (_) => AudioCallPage(
+                            sender: Provider.of<ChatProvider>(context, listen: false).sender!,
+                            recipient: Provider.of<ChatProvider>(context, listen: false).recipient!,
+                          )));
+                }
+              },
+            ),
+            IconButton(
+              icon: "calling/video_call_icon".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
+              padding: EdgeInsets.zero,
+              visualDensity: VisualDensity.compact,
+              tooltip: "Video",
+              onPressed: () async {
+                bool videoPermission = await Provider.of<ChatProvider>(context, listen: false).checkVideoPermissions();
+                if (!videoPermission) {
+                  context.showConfirmDialog("To perform Video call, we need permission to access microphone & Camera.", title: "Permission Required", onTap: () async {
+                    Navigator.pop(context);
+                    videoPermission = await Provider.of<ChatProvider>(context, listen: false).requestVideoPermissions();
+                    if (videoPermission) {
+                      bool openSetting = await showDialog(
+                        context: context,
+                        builder: (_) => const AAlertDialog(
+                          title: "Permission denied",
+                          content: "Permission is denied. Please go to application Setting to enable it.",
+                          button1Text: "Cancel",
+                          button2Text: "Open Setting",
+                        ),
+                      );
+                      if (!openSetting) PermissionHandler.openAppSettings();
+                      return;
+                    }
+                  });
+                }
+                Navigator.of(context).push(MaterialPageRoute(builder: (_) => CallPage(isAudio: false)));
+              },
+            ),
+          ],
+        ),
         body: Selector<ChatProvider, _ChatConnectionState>(
           selector: (_, provider) => _ChatConnectionState(
             isLoading: provider.chatLoginTokenLoading,
@@ -272,11 +346,7 @@ class _ChatPageState extends State<ChatPage> {
                         4.width,
                         Text(
                           "View All Documents",
-                          style: AppTextStyles.bodyText.copyWith(
-                            color: AppColor.white10,
-                            decoration: TextDecoration.underline,
-                            decorationColor: AppColor.white10
-                          ),
+                          style: AppTextStyles.bodyText.copyWith(color: AppColor.white10, decoration: TextDecoration.underline, decorationColor: AppColor.white10),
                         ).onPress(() {
                           Navigator.push(context, CupertinoPageRoute(builder: (context) => ViewAllAttachmentPage(moduleId: widget.moduleId, requestId: widget.requestId)));
                         }),
@@ -396,7 +466,7 @@ class _ChatPageState extends State<ChatPage> {
                               style: const ButtonStyle(
                                 tapTargetSize: MaterialTapTargetSize.shrinkWrap, // or .padded
                               ),
-                              icon: "chat_attachment".toSvgAsset(width: 24, height: 24,color: AppColor.icon2Color(context)),
+                              icon: "chat_attachment".toSvgAsset(width: 24, height: 24, color: AppColor.icon2Color(context)),
                               constraints: const BoxConstraints(),
                             ),
                             IconButton(
@@ -417,7 +487,7 @@ class _ChatPageState extends State<ChatPage> {
                               style: const ButtonStyle(
                                 tapTargetSize: MaterialTapTargetSize.shrinkWrap, // or .padded
                               ),
-                              icon: "chat_mic".toSvgAsset(width: 24, height: 24,color: AppColor.icon2Color(context)),
+                              icon: "chat_mic".toSvgAsset(width: 24, height: 24, color: AppColor.icon2Color(context)),
                               constraints: const BoxConstraints(),
                             ),
                           ] else if (chatState == ChatState.voiceRecordingStarted) ...[
diff --git a/lib/modules/cx_module/chat/chat_provider.dart b/lib/modules/cx_module/chat/chat_provider.dart
index dc1cbbc7..fb309e2f 100644
--- a/lib/modules/cx_module/chat/chat_provider.dart
+++ b/lib/modules/cx_module/chat/chat_provider.dart
@@ -112,7 +112,7 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
   Future<void> reset() async {
     // OPTIMIZATION: Use async/await for proper cleanup
     await _disposeConnection();
-    
+
     chatLoginTokenLoading = false;
     chatParticipantLoading = false;
     userChatHistoryLoading = false;
@@ -123,7 +123,7 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
     recipient = null;
     ChatApiClient().chatLoginResponse = null;
   }
-  
+
   /// OPTIMIZATION: Override dispose to ensure SignalR connection cleanup
   /// This prevents connection leaks when provider is removed from widget tree
   @override
@@ -178,6 +178,20 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
     }
   }
 
+  Future<bool> checkAudioPermissions() => Permission.microphone.isGranted;
+
+  Future<bool> checkVideoPermissions() async => (await Permission.microphone.isGranted) && (await Permission.camera.isGranted);
+
+  Future<bool> requestAudioPermissions() async {
+    var result = await [Permission.microphone].request();
+    return (result[Permission.microphone] == PermissionStatus.granted);
+  }
+
+  Future<bool> requestVideoPermissions() async {
+    var result = await [Permission.microphone, Permission.camera].request();
+    return (result[Permission.microphone] == PermissionStatus.granted) && (result[Permission.camera] == PermissionStatus.granted);
+  }
+
   // Future<void> getUserLoadChatHistory(int moduleId, int requestId, String myId, String assigneeEmployeeNumber) async {
   //   await loadChatHistory(moduleId, requestId, myId, assigneeEmployeeNumber);
   // }
@@ -206,7 +220,7 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
     }
     moduleID = moduleId;
     referenceID = requestId;
-    
+
     // OPTIMIZATION: Wrap connection in try-catch to prevent leaks on error
     if (!readOnly) {
       try {
@@ -218,7 +232,7 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
         // Continue loading chat history even if hub connection fails
       }
     }
-    
+
     userChatHistory = null;
     userChatHistory = await ChatApiClient().loadChatHistory(moduleId, requestId, myId, assigneeEmployeeNumber);
     chatResponseList = userChatHistory ?? [];
@@ -291,13 +305,12 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
   //   }
   // }
 
-  /// OPTIMIZATION: Improved hub connection with error handling
-  /// Prevents connection leaks if initialization fails
+
   Future<void> buildHubConnection(String conversationID) async {
     try {
       // Dispose existing connection if any
       await _disposeConnection();
-      
+
       chatHubConnection = await getHubConnection();
       await chatHubConnection!.start();
       if (kDebugMode) {
@@ -331,17 +344,17 @@ class ChatProvider with ChangeNotifier, DiagnosticableTreeMixin {
     if (kDebugMode) {
       print('🔧 Creating new SignalR hub connection...');
     }
-    
+
     HubConnection hub;
     HttpConnectionOptions httpOp = HttpConnectionOptions(skipNegotiation: false, logMessageContent: true);
     hub = HubConnectionBuilder()
         .withUrl("${URLs.chatHubUrlChat}?UserId=${chatLoginResponse!.userId}&source=Desktop&access_token=${chatLoginResponse!.token}", options: httpOp)
         .withAutomaticReconnect(retryDelays: <int>[2000, 5000, 10000, 20000]).build();
-    
+
     if (kDebugMode) {
       print('✅ SignalR hub connection created');
     }
-    
+
     return hub;
   }
 
diff --git a/lib/modules/cx_module/chat/model/chat_participant_model.dart b/lib/modules/cx_module/chat/model/chat_participant_model.dart
index 80c6bfc4..a16bf9d8 100644
--- a/lib/modules/cx_module/chat/model/chat_participant_model.dart
+++ b/lib/modules/cx_module/chat/model/chat_participant_model.dart
@@ -47,8 +47,9 @@ class Participants {
   String? employeeNumber;
   String? role;
   int? userStatus;
+  String? image;
 
-  Participants({this.userId, this.userName, this.employeeNumber, this.role, this.userStatus});
+  Participants({this.userId, this.userName, this.employeeNumber, this.role, this.image, this.userStatus});
 
   Participants.fromJson(Map<String, dynamic> json) {
     userId = json['userId'];
@@ -56,6 +57,7 @@ class Participants {
     employeeNumber = json['employeeNumber'];
     role = json['role'];
     userStatus = json['userStatus'];
+    image = json['image'];
   }
 
   Map<String, dynamic> toJson() {
@@ -65,6 +67,7 @@ class Participants {
     data['employeeNumber'] = employeeNumber;
     data['role'] = role;
     data['userStatus'] = userStatus;
+    data['image'] = image;
     return data;
   }
-}
+}
\ No newline at end of file
diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart
index bd475186..9d5b626c 100644
--- a/lib/new_views/pages/land_page/land_page.dart
+++ b/lib/new_views/pages/land_page/land_page.dart
@@ -2,6 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_callkit_incoming/entities/entities.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test_sa/controllers/notification/firebase_notification_manger.dart';
@@ -15,6 +17,8 @@ import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/string_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/models/enums/user_types.dart';
+import 'package:test_sa/modules/cx_module/chat/calling/audio_call_page.dart';
+import 'package:test_sa/modules/cx_module/chat/model/chat_participant_model.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 import 'package:test_sa/new_views/pages/land_page/create_request_type_bottom_sheet.dart';
@@ -115,7 +119,7 @@ class _LandPageState extends State<LandPage> {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           _userProvider!.getSwipeLastTransaction(userId: _userProvider!.user!.userID!);
           _userProvider!.getSiteContactInfo();
-          if(!_userProvider!.isHouseKeeper) {
+          if (!_userProvider!.isHouseKeeper) {
             Provider.of<VendorProvider>(context, listen: false).getData();
           }
         });
@@ -133,6 +137,7 @@ class _LandPageState extends State<LandPage> {
       ];
       if (isFCM) {
         FirebaseNotificationManger.initialized(context);
+        callingEvents(context);
         NotificationManger.initialisation((notificationDetails) {
           FirebaseNotificationManger.handleMessage(context, json.decode(notificationDetails.payload!));
         }, (id, title, body, payload) async {});
@@ -209,4 +214,61 @@ class _LandPageState extends State<LandPage> {
       ),
     );
   }
+
+  callingEvents(BuildContext context) {
+    FlutterCallkitIncoming.onEvent.listen((CallEvent? event) async {
+      switch (event!.eventName) {
+        case CallEventConstants.actionCallIncoming:
+          // TODO: received an incoming call
+          break;
+        case CallEventConstants.actionCallStart:
+          // TODO: started an outgoing call
+          // TODO: show screen calling in Flutter
+          break;
+        case CallEventConstants.actionCallAccept:
+          var activeCalls = await FlutterCallkitIncoming.activeCalls();
+
+          if (activeCalls is List && activeCalls.isNotEmpty) {
+            final lastCall = activeCalls.last;
+            Navigator.of(context).push(MaterialPageRoute(
+                builder: (_) =>
+                    AudioCallPage(sender: Participants(employeeNumber: lastCall.extra?["calleeEmployeeNumber"]), recipient: Participants(employeeNumber: lastCall.extra?["callerEmployeeNumber"]))));
+          }
+          break;
+        case CallEventConstants.actionCallDecline:
+          // TODO: declined an incoming call
+          break;
+        case CallEventConstants.actionCallEnded:
+          // TODO: ended an incoming/outgoing call
+          break;
+        case CallEventConstants.actionCallTimeout:
+          // TODO: missed an incoming call
+          break;
+        case CallEventConstants.actionCallCallback:
+          // TODO: click action `Call back` from missed call notification
+          break;
+        case CallEventConstants.actionCallToggleHold:
+          // TODO: only iOS
+          break;
+        case CallEventConstants.actionCallToggleMute:
+          // TODO: only iOS
+          break;
+        case CallEventConstants.actionCallToggleDmtf:
+          // TODO: only iOS
+          break;
+        case CallEventConstants.actionCallToggleGroup:
+          // TODO: only iOS
+          break;
+        case CallEventConstants.actionCallToggleAudioSession:
+          // TODO: only iOS
+          break;
+        case CallEventConstants.actionDidUpdateDevicePushTokenVoip:
+          // TODO: only iOS
+          break;
+        case CallEventConstants.actionCallCustom:
+          // TODO: for custom action
+          break;
+      }
+    });
+  }
 }
diff --git a/lib/new_views/pages/splash_page.dart b/lib/new_views/pages/splash_page.dart
index 2b619ac4..6fea3c6f 100644
--- a/lib/new_views/pages/splash_page.dart
+++ b/lib/new_views/pages/splash_page.dart
@@ -6,6 +6,7 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flare_flutter/flare_actor.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:provider/provider.dart';
 import 'package:safe_device/safe_device.dart';
@@ -206,7 +207,7 @@ class _SplashPageState extends State<SplashPage> {
                 animation: "splash",
                 callback: (animation) async {
                   bool isSafe = await checkDeviceSafety();
-
+                  await checkVoipCalling();
                   if (!isSafe) {
                     Navigator.pushNamedAndRemoveUntil(context, UnsafeDeviceScreen.routeName, (_) => false);
                   } else {
@@ -237,6 +238,30 @@ class _SplashPageState extends State<SplashPage> {
     );
   }
 
+  checkVoipCalling() async {
+    var activeCalls = await FlutterCallkitIncoming.activeCalls();
+
+    if (activeCalls is List && activeCalls.isNotEmpty) {
+      final lastCall = activeCalls.last;
+
+      print("lastCall:$lastCall");
+
+      // // Check if the last state recorded was an accepted call
+      // if (lastCall['isAccepted'] == true) {
+      //   final String? callerId = lastCall['extra']['callerId'];
+      //   final String? callUuid = lastCall['id'];
+      //
+      //   await FlutterCallkitIncoming.setCallConnected(callUuid!);
+      //
+      //   // Route user to the calling interface
+      //   Navigator.push(
+      //     context,
+      //     MaterialPageRoute(builder: (context) => InAppCallScreen(callerId: callerId)),
+      //   );
+      // }
+    }
+  }
+
   Future<bool> checkDeviceSafety() async {
     if (!kReleaseMode) return true;
     bool isJailBroken = false;
diff --git a/lib/views/widgets/dialogs/confirm_dialog.dart b/lib/views/widgets/dialogs/confirm_dialog.dart
index 60db0c03..9730334e 100644
--- a/lib/views/widgets/dialogs/confirm_dialog.dart
+++ b/lib/views/widgets/dialogs/confirm_dialog.dart
@@ -4,6 +4,8 @@ import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
+import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
+import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
 
 class ConfirmDialog extends StatelessWidget {
   final String? title;
@@ -27,30 +29,39 @@ class ConfirmDialog extends StatelessWidget {
           mainAxisSize: MainAxisSize.min,
           children: [
             Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Expanded(
-                  child: Text(
-                    title ?? "Confirm",
-                    style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
-                  ).paddingOnly(top: 16),
+                  child:
+                      // InfoHeader16Widget(title ?? "Confirm")
+                      InfoTextLabelWidget(
+                    label: title ?? "Confirm",
+                    textStyle: AppTextStyles.heading5,
+                  )
+
+                          // Text(
+                          //             title ?? "Confirm",
+                          //             style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
+                          //           )
+
+                          .paddingOnly(top: 0),
                 ),
                 IconButton(
                   padding: EdgeInsets.zero,
                   icon: const Icon(Icons.close),
-                  color: AppColor.iconColor(context),
-                  constraints: const BoxConstraints(),
+                  color: AppColor.icon2Color(context),
+                  // constraints: const BoxConstraints(),
                   onPressed: () => onCloseTap ?? Navigator.pop(context),
                   // onPressed: () => Navigator.pop(context),
                 )
               ],
             ),
-            message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(),
+            message != null ? InfoTextLabelWidget(label: message!, textStyle: AppTextStyles.bodyText) : const SizedBox(),
             28.height,
             AppFilledButton(
               label: okTitle ?? "OK",
               onPressed: onTap ?? () => Navigator.pop(context),
-              textColor: Colors.white,
+              // textColor: Colors.white,
               //color: Ap.green,
             ),
           ],
diff --git a/lib/views/widgets/dialogs/dialog.dart b/lib/views/widgets/dialogs/dialog.dart
index e7132eb1..f31ff264 100644
--- a/lib/views/widgets/dialogs/dialog.dart
+++ b/lib/views/widgets/dialogs/dialog.dart
@@ -9,8 +9,10 @@ import 'package:test_sa/new_views/app_style/app_color.dart';
 class AAlertDialog extends StatelessWidget {
   final String? title;
   final String? content;
+  final String? button1Text;
+  final String? button2Text;
 
-  const AAlertDialog({Key? key, this.title, this.content}) : super(key: key);
+  const AAlertDialog({Key? key, this.title, this.content, this.button1Text, this.button2Text}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -21,14 +23,14 @@ class AAlertDialog extends StatelessWidget {
             actions: <Widget>[
               TextButton(
                 // child: Text(_subtitle.confirm),
-                child: Text(context.translation.confirm),
+                child: Text(button1Text ?? context.translation.confirm),
                 onPressed: () {
                   Navigator.of(context).pop(true);
                 },
               ),
               TextButton(
                 // child: Text(_subtitle.cancel),
-                child: Text(context.translation.cancel),
+                child: Text(button2Text ?? context.translation.cancel),
                 onPressed: () {
                   Navigator.of(context).pop(false);
                 },
@@ -44,14 +46,14 @@ class AAlertDialog extends StatelessWidget {
             actions: <Widget>[
               TextButton(
                 // child: Text(_subtitle.confirm),
-                child: Text(context.translation.confirm, style: AppTextStyles.bodyText.copyWith(color: AppColor.loadingColor(context))),
+                child: Text(button1Text ?? context.translation.confirm, style: AppTextStyles.bodyText.copyWith(color: AppColor.loadingColor(context))),
                 onPressed: () {
                   Navigator.of(context).pop(true);
                 },
               ),
               TextButton(
                 // child: Text(_subtitle.cancel),
-                child: Text(context.translation.cancel, style: AppTextStyles.bodyText.copyWith(color: AppColor.loadingColor(context))),
+                child: Text(button2Text ?? context.translation.cancel, style: AppTextStyles.bodyText.copyWith(color: AppColor.loadingColor(context))),
                 onPressed: () {
                   Navigator.of(context).pop(false);
                 },
diff --git a/pubspec.lock b/pubspec.lock
index 8fa3ed1c..2e49098a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -233,6 +233,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  dart_webrtc:
+    dependency: transitive
+    description:
+      name: dart_webrtc
+      sha256: f6d615bddea5e458ce180a914f3055c234ffb52fb7397a51b3491e76d6d7edb2
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.1"
   date_picker_timeline:
     dependency: "direct main"
     description:
@@ -423,6 +431,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.4.1"
+  flutter_callkit_incoming:
+    dependency: "direct main"
+    description:
+      name: flutter_callkit_incoming
+      sha256: "0e418f2c7fdbddeebc0288ce0e10c17fd01c1a886731d5cb1048d86b72443b92"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
   flutter_custom_month_picker:
     dependency: "direct main"
     description:
@@ -590,6 +606,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_webrtc:
+    dependency: "direct main"
+    description:
+      name: flutter_webrtc
+      sha256: "0f89dee7f4c35dab5611f351c3897a3bfe9f7057720cc7da209b52455af4316e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.2"
   fluttertoast:
     dependency: "direct main"
     description:
@@ -862,6 +886,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.20.2"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.2"
   json_annotation:
     dependency: transitive
     description:
@@ -1907,6 +1939,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  webrtc_interface:
+    dependency: transitive
+    description:
+      name: webrtc_interface
+      sha256: c6f100eac5057d9a817a60473126f9828c796d42884d498af4f339c97b21014f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
   wifi_iot:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 40585736..ca5b0e3e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -109,7 +109,8 @@ dependencies:
   local_auth_darwin: ^1.4.0
   haptic_feedback: ^0.6.4+3
   sn_progress_dialog: ^1.2.0
-
+  flutter_webrtc: ^1.5.2
+  flutter_callkit_incoming: ^3.1.3
 
 dev_dependencies:
   flutter_test:
@@ -139,6 +140,7 @@ flutter:
     - assets/audio/
     - assets/images/
     - assets/images/dashboard/
+    - assets/images/calling/
     - assets/images/wo/
     - assets/images/asset_image_upload/
     - assets/lottie/