ordering-ui-react-native 0.21.28-release → 0.21.29-release
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -66,7 +66,8 @@ const AddressFormUI = (props: AddressFormParams) => {
|
|
|
66
66
|
isFromProductsList,
|
|
67
67
|
hasAddressDefault,
|
|
68
68
|
afterSignup,
|
|
69
|
-
businessSlug
|
|
69
|
+
businessSlug,
|
|
70
|
+
isFromCheckout
|
|
70
71
|
} = props;
|
|
71
72
|
|
|
72
73
|
const theme = useTheme();
|
|
@@ -383,9 +384,11 @@ const AddressFormUI = (props: AddressFormParams) => {
|
|
|
383
384
|
auth &&
|
|
384
385
|
!afterSignup
|
|
385
386
|
) {
|
|
386
|
-
|
|
387
|
-
? navigation.
|
|
388
|
-
:
|
|
387
|
+
isFromCheckout
|
|
388
|
+
? navigation.goBack()
|
|
389
|
+
: !isFromProductsList
|
|
390
|
+
? navigation.navigate('BottomTab')
|
|
391
|
+
: navigation.navigate('Business');
|
|
389
392
|
}
|
|
390
393
|
}, [orderState?.options?.address]);
|
|
391
394
|
|
|
@@ -217,7 +217,8 @@ const AddressListUI = (props: AddressListParams) => {
|
|
|
217
217
|
onSaveAddress: handleSaveAddress,
|
|
218
218
|
isSelectedAfterAdd: true,
|
|
219
219
|
isFromProductsList: isFromProductsList,
|
|
220
|
-
hasAddressDefault: !!orderState.options?.address?.location
|
|
220
|
+
hasAddressDefault: !!orderState.options?.address?.location,
|
|
221
|
+
isFromCheckout: route?.params?.isFromCheckout
|
|
221
222
|
}
|
|
222
223
|
) : onNavigationRedirect(
|
|
223
224
|
'AddressFormInitial',
|
|
@@ -228,7 +229,8 @@ const AddressListUI = (props: AddressListParams) => {
|
|
|
228
229
|
onSaveAddress: handleSaveAddress,
|
|
229
230
|
isSelectedAfterAdd: true,
|
|
230
231
|
isFromProductsList: isFromProductsList,
|
|
231
|
-
hasAddressDefault: !!orderState.options?.address?.location
|
|
232
|
+
hasAddressDefault: !!orderState.options?.address?.location,
|
|
233
|
+
isFromCheckout: route?.params?.isFromCheckout
|
|
232
234
|
})}
|
|
233
235
|
>
|
|
234
236
|
<OIcon src={theme.images.general.pencil} width={16} style={{ marginHorizontal: 4 }} />
|
|
@@ -305,7 +307,8 @@ const AddressListUI = (props: AddressListParams) => {
|
|
|
305
307
|
addressesList: addressList?.addresses,
|
|
306
308
|
nopadding: true,
|
|
307
309
|
isSelectedAfterAdd: true,
|
|
308
|
-
hasAddressDefault: !!orderState.options?.address?.location
|
|
310
|
+
hasAddressDefault: !!orderState.options?.address?.location,
|
|
311
|
+
isFromCheckout: route?.params?.isFromCheckout
|
|
309
312
|
}) : onNavigationRedirect(
|
|
310
313
|
'AddressFormInitial',
|
|
311
314
|
{
|
|
@@ -314,7 +317,8 @@ const AddressListUI = (props: AddressListParams) => {
|
|
|
314
317
|
addressesList: addressList?.addresses,
|
|
315
318
|
nopadding: true,
|
|
316
319
|
isSelectedAfterAdd: true,
|
|
317
|
-
hasAddressDefault: !!orderState.options?.address?.location
|
|
320
|
+
hasAddressDefault: !!orderState.options?.address?.location,
|
|
321
|
+
isFormCheckout: route?.params?.isFromCheckout
|
|
318
322
|
})}
|
|
319
323
|
/>
|
|
320
324
|
</>
|