Fix incorrect addressId when new address is added during checkout

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/ui/checkout/CheckoutActivity.kt

@@ -52,19 +52,7 @@ class CheckoutActivity : AppCompatActivity() {
         observeLoading()
 
         checkoutViewModel.getCartItems()
-        user = checkoutViewModel.getUser()
-        if (user.address.isEmpty()) {
-            btnAddDeliveryAddress.visibility = View.VISIBLE
-            btnChangeDeliveryAddress.visibility = View.GONE
-            tvDeliveryAddress.visibility = View.GONE
-        } else {
-            btnAddDeliveryAddress.visibility = View.GONE
-            btnChangeDeliveryAddress.visibility = View.VISIBLE
-            tvDeliveryAddress.visibility = View.VISIBLE
-
-            deliveryAddress = user.address[0]
-            tvDeliveryAddress.text = deliveryAddress!!.streetAddress
-        }
+        loadAddressList()
 
         btnChangeDeliveryAddress.setOnClickListener {
             showChangeDeliveryAddressDialog()
@@ -96,8 +84,7 @@ class CheckoutActivity : AppCompatActivity() {
                         btnChangeDeliveryAddress.visibility = View.VISIBLE
                         tvDeliveryAddress.visibility = View.VISIBLE
 
-                        deliveryAddress = address
-                        tvDeliveryAddress.text = deliveryAddress!!.streetAddress
+                        loadAddressList()
                     }
                     is Resource.Failure -> toast(resource.message)
                 }
@@ -122,6 +109,22 @@ class CheckoutActivity : AppCompatActivity() {
         })
     }
 
+    private fun loadAddressList(){
+        user = checkoutViewModel.getUser()
+        if (user.address.isEmpty()) {
+            btnAddDeliveryAddress.visibility = View.VISIBLE
+            btnChangeDeliveryAddress.visibility = View.GONE
+            tvDeliveryAddress.visibility = View.GONE
+        } else {
+            btnAddDeliveryAddress.visibility = View.GONE
+            btnChangeDeliveryAddress.visibility = View.VISIBLE
+            tvDeliveryAddress.visibility = View.VISIBLE
+
+            deliveryAddress = user.address[0]
+            tvDeliveryAddress.text = deliveryAddress!!.streetAddress
+        }
+    }
+
     private fun showChangeDeliveryAddressDialog() {
         val addresses = user.address.map { it.streetAddress }.toTypedArray()
         AlertDialog.Builder(this)