link context care

dimagi · Sep 30, 2023 · db70b44 · db70b44
1 parent 6387017
commit db70b44
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCLinkFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCLinkFragment.kt
@@ -45,13 +45,15 @@ class CCLinkFragment :
                         }
 
                         is GenerateAbhaUiState.Success -> {
+                            binding.linkInfoTxt.text = resources.getString(R.string.linking_cc_success)
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
                             binding.retryLink.visibility = View.GONE
                             binding.retryLink.isEnabled = false
 
                         }
 
                         is GenerateAbhaUiState.AbdmError -> {
+                            binding.linkInfoTxt.text = resources.getString(R.string.linking_cc_error)
                             binding.retryLink.visibility = View.VISIBLE
                             binding.retryLink.isEnabled = true
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
@@ -60,6 +62,7 @@ class CCLinkFragment :
                         }
 
                         is GenerateAbhaUiState.Error -> {
+                            binding.linkInfoTxt.text = resources.getString(R.string.linking_cc_error)
                             binding.retryLink.visibility = View.VISIBLE
                             binding.retryLink.isEnabled = true
                             (activity as AbdmActivity).showBlockerDialog(it.data.get("message").asString)

diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt
@@ -217,7 +217,7 @@ class CareContextViewModel @Inject constructor(
                             uiState.emit(
                                 GenerateAbhaUiState.AbdmError(
                                     hqRespModel.value,
-                                    RequestType.CC_AUTH_CONFIRM
+                                    RequestType.CC_LINK
                                 )
                             )
                         }

diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
@@ -116,4 +116,6 @@
     <string name="ccDetails">CareContext Detail</string>
     <string name="linking_cc">Linking context care...</string>
     <string name="retryLink">Link Context Care</string>
+    <string name="linking_cc_success">Context care linked successfully.</string>
+    <string name="linking_cc_error">Context care not linked. Please retry.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -154,4 +154,6 @@ Please fill this field if the beneficiary is interested in a custom ABHA address
     <string name="ccDetails">CareContext Detail</string>
     <string name="linking_cc">Linking context care...</string>
     <string name="retryLink">Link Context Care</string>
+    <string name="linking_cc_success">Context care linked successfully.</string>
+    <string name="linking_cc_error">Context care not linked. Please retry.</string>
 </resources>
diff --git a/data/src/main/java/org/commcare/dalvik/data/services/HqServices.kt b/data/src/main/java/org/commcare/dalvik/data/services/HqServices.kt
@@ -74,6 +74,6 @@ interface HqServices {
     @POST("user_auth/auth_confirm")
     suspend fun confirmCareContextAuth(@Body confirmAuthModel: ConfirmAuthModel):Response<JsonObject>
     @POST("hip/link_care_context")
-    suspend fun  linkCareContext(careContextLinkModel:CCLinkModel):Response<JsonObject>
+    suspend fun  linkCareContext(@Body careContextLinkModel:CCLinkModel):Response<JsonObject>
 
 }