From 2c3c270c43ca6ace1f1177f3bb9a808692e9ba4f Mon Sep 17 00:00:00 2001
From: Elham Rababh <elham.a.rababah@gmail.com>
Date: Wed, 10 Nov 2021 08:39:45 +0200
Subject: [PATCH] finish steps inside payment

---
 .../pharmacyAddresses/PharmacyAddresses.dart         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
index 338fe87e..85bc7cb8 100644
--- a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
+++ b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
@@ -48,7 +48,7 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
     return BaseView<PharmacyAddressesViewModel>(
       onModelReady: (model) => model.getAddressesList(),
       builder: (_, model, wi) => AppScaffold(
-        appBarTitle: TranslationBase.of(context).changeAddress,
+        appBarTitle: widget.isUpdate?TranslationBase.of(context).changeAddress:"Add Address",
         isShowAppBar: true,
         isPharmacy: true,
         baseViewModel: model,
@@ -66,11 +66,6 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
                       () {
                         setState(() {
                           model.setSelectedAddressIndex(index);
-                          //TODO Elham*
-                          widget.orderPreviewViewModel.paymentCheckoutData
-                                  .address =
-                              Addresses.fromJson(
-                                  model.addresses[index].toJson());
                         });
                       },
                       model.selectedAddressIndex == index,
@@ -127,6 +122,11 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
                   fontSize: 14,
                   vPadding: 8,
                   handler: () {
+                    //TODO Elham*
+                    widget.orderPreviewViewModel.paymentCheckoutData
+                        .address =
+                        Addresses.fromJson(
+                            model.addresses[model.selectedAddressIndex].toJson());
                     model.saveSelectedAddressLocally(
                         model.addresses[model.selectedAddressIndex]);
                     _navigateToPaymentOption(model);