ordering-ui-react-native 0.21.60 → 0.21.62
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 +1 -1
- package/themes/original/src/components/BusinessController/index.tsx +4 -1
- package/themes/original/src/components/Checkout/index.tsx +1 -1
- package/themes/original/src/components/NetworkError/index.tsx +2 -3
- package/themes/original/src/components/Notifications/index.tsx +2 -4
package/package.json
CHANGED
|
@@ -274,7 +274,10 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
|
|
|
274
274
|
<OText
|
|
275
275
|
size={textSize + 2}
|
|
276
276
|
style={{ lineHeight: 18, marginBottom: 6, width: '90%' }}
|
|
277
|
-
weight={'500'}
|
|
277
|
+
weight={'500'}
|
|
278
|
+
numberOfLines={1}
|
|
279
|
+
ellipsizeMode='tail'
|
|
280
|
+
>
|
|
278
281
|
{business?.name}
|
|
279
282
|
</OText>
|
|
280
283
|
{(!hideBusinessFavorite || !hideBusinessReviews) && (
|
|
@@ -357,7 +357,7 @@ const CheckoutUI = (props: any) => {
|
|
|
357
357
|
|
|
358
358
|
useEffect(() => {
|
|
359
359
|
if (cart?.products?.length === 0) {
|
|
360
|
-
if (cart?.
|
|
360
|
+
if (cart?.business_id !== null) {
|
|
361
361
|
onNavigationRedirect('Business', { store: cart?.business?.slug, header: null, logo: null, fromMulti: props.fromMulti })
|
|
362
362
|
} else {
|
|
363
363
|
onNavigationRedirect('Wallets')
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import { useLanguage
|
|
2
|
+
import { useLanguage } from 'ordering-components/native'
|
|
3
3
|
import { Dimensions } from 'react-native'
|
|
4
4
|
import RNRestart from 'react-native-restart'
|
|
5
5
|
import { OText, OIcon, OButton } from '../shared'
|
|
@@ -16,8 +16,7 @@ export const NetworkError = (props: NoNetworkParams) => {
|
|
|
16
16
|
} = props
|
|
17
17
|
const theme = useTheme()
|
|
18
18
|
const [, t] = useLanguage()
|
|
19
|
-
const
|
|
20
|
-
const urlimage = orderingTheme?.theme?.no_internet?.components?.image
|
|
19
|
+
const urlimage = theme?.no_internet?.components?.image
|
|
21
20
|
const noNetworkImage = image || theme.images.general.noNetwork
|
|
22
21
|
const deviceWidth = Dimensions.get('screen').width
|
|
23
22
|
|
|
@@ -3,7 +3,6 @@ import {
|
|
|
3
3
|
UserFormDetails as NotificationsController,
|
|
4
4
|
useLanguage,
|
|
5
5
|
useSession,
|
|
6
|
-
useOrderingTheme,
|
|
7
6
|
useToast,
|
|
8
7
|
ToastType,
|
|
9
8
|
} from 'ordering-components/native'
|
|
@@ -28,7 +27,6 @@ const NotificationsUI = (props: any) => {
|
|
|
28
27
|
const [{ user: userSession }] = useSession()
|
|
29
28
|
const [, t] = useLanguage();
|
|
30
29
|
const [, { showToast }] = useToast();
|
|
31
|
-
const [orderingTheme] = useOrderingTheme()
|
|
32
30
|
|
|
33
31
|
const user = userData || userSession
|
|
34
32
|
|
|
@@ -45,8 +43,8 @@ const NotificationsUI = (props: any) => {
|
|
|
45
43
|
})
|
|
46
44
|
|
|
47
45
|
const goToBack = () => navigation?.canGoBack() && navigation.goBack()
|
|
48
|
-
const showCustomerPromotions = !
|
|
49
|
-
const showNotifications = !
|
|
46
|
+
const showCustomerPromotions = !theme?.profile?.components?.promotions?.hidden
|
|
47
|
+
const showNotifications = !theme?.profile?.components?.notification_settings?.hidden
|
|
50
48
|
|
|
51
49
|
const handleEditNotifications = (key: any, value: any) => {
|
|
52
50
|
setNotificationsList({
|