ordering-ui-react-native 0.21.98 → 0.21.99

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/themes/original/src/components/Home/index.tsx +3 -3
  3. package/themes/original/src/components/OrderProgress/index.tsx +7 -1
  4. package/themes/original/src/components/shared/OButton.tsx +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-react-native",
3
- "version": "0.21.98",
3
+ "version": "0.21.99",
4
4
  "description": "Reusable components made in react native",
5
5
  "main": "src/index.tsx",
6
6
  "author": "ordering.inc",
package/themes/original/src/components/Home/index.tsx CHANGED
@@ -49,11 +49,11 @@ export const Home = (props: any) => {
49
49
  </OText>
50
50
  <OButton
51
51
  text={t('LOGIN_NOW', 'Login now')}
52
- bgColor={theme.general.components.buttons.color ?? theme.colors.primary}
53
- borderColor={theme.general.components.buttons.color ?? theme.colors.primary}
52
+ bgColor={theme.colors.primary}
53
+ borderColor={theme.colors.primary}
54
54
  style={styles.buttons}
55
55
  isCircle={false}
56
- textStyle={{ color: `${theme.general.components.buttons.buttonTextColor ?? 'white'}` }}
56
+ textStyle={{ color: 'white' }}
57
57
  onClick={() => onNavigationRedirect('Login')}
58
58
  imgRightSrc={null}
59
59
  />
package/themes/original/src/components/OrderProgress/index.tsx CHANGED
@@ -220,7 +220,13 @@ export const OrderProgress = (props: any) => {
220
220
  'delivery_type',
221
221
  'delivery_datetime_utc',
222
222
  'delivery_datetime',
223
- 'reporting_data'
223
+ 'reporting_data',
224
+ 'eta_current_status_time',
225
+ 'eta_previous_status_times',
226
+ 'eta_time',
227
+ 'delivered_in',
228
+ 'prepared_in',
229
+ 'eta_drive_time'
224
230
  ],
225
231
  noGiftCardOrders: true
226
232
  }
package/themes/original/src/components/shared/OButton.tsx CHANGED
@@ -119,7 +119,7 @@ const OButton = (props: Props): React.ReactElement => {
119
119
  style={{ width: props.isCircle ? 52 : props.style?.width, ...props.parentStyle }}
120
120
  disabled={props.isDisabledWithSameStyles}
121
121
  >
122
- <StyledButton style={{ ...props.style, backgroundColor: props.bgColor ?? theme?.general?.components?.buttons?.color, borderColor: props.borderColor, borderRadius: parseInt(theme?.general?.components?.buttons?.borderRadius) || props.style?.borderRadius }}>
122
+ <StyledButton style={{ ...props.style, backgroundColor: theme?.general?.components?.buttons?.color ?? props.bgColor, borderColor: theme?.general?.components?.buttons?.color ?? props.borderColor, borderRadius: parseInt(theme?.general?.components?.buttons?.borderRadius) || props.style?.borderRadius }}>
123
123
  {props.icon ? (
124
124
  <props.icon {...props.iconProps} />
125
125
  ) : null}
@@ -127,7 +127,7 @@ const OButton = (props: Props): React.ReactElement => {
127
127
  <OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} color={theme.colors.textNormal} />
128
128
  ) : null}
129
129
  {props.text ? (
130
- <StyledText style={{ ...props.textStyle, color: props?.textStyle?.color ?? theme?.general?.components?.buttons?.buttonTextColor }}>{props.text}</StyledText>
130
+ <StyledText style={{ ...props.textStyle, color: theme?.general?.components?.buttons?.buttonTextColor ?? props?.textStyle?.color }}>{props.text}</StyledText>
131
131
  ) : null}
132
132
  {props.imgRightSrc ? (
133
133
  <EndImage style={props.imgRightStyle} source={props.imgRightSrc} />