ordering-ui-react-native 0.12.69 → 0.12.70
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/AddressList/index.tsx +0 -8
- package/themes/original/src/components/OrderDetails/index.tsx +3 -5
- package/themes/original/src/components/UserFormDetails/index.tsx +36 -1
- package/themes/original/src/components/UserProfileForm/index.tsx +3 -2
- package/themes/original/src/components/VerifyPhone/index.tsx +20 -10
- package/themes/original/src/components/VerifyPhone/styles.tsx +2 -2
package/package.json
CHANGED
|
@@ -290,14 +290,6 @@ const AddressListUI = (props: AddressListParams) => {
|
|
|
290
290
|
/>
|
|
291
291
|
</>
|
|
292
292
|
)}
|
|
293
|
-
{!isFromProfile && addressList?.addresses?.length > 0 && (
|
|
294
|
-
<OButton
|
|
295
|
-
text={t('CONTINUE', 'Continue')}
|
|
296
|
-
style={styles.button}
|
|
297
|
-
onClick={() => onNavigatorRedirect()}
|
|
298
|
-
textStyle={{ color: theme.colors.white }}
|
|
299
|
-
/>
|
|
300
|
-
)}
|
|
301
293
|
</AddressListContainer>
|
|
302
294
|
)}
|
|
303
295
|
</Container>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useState, useEffect } from 'react';
|
|
2
|
-
import { View, StyleSheet, BackHandler, KeyboardAvoidingView, Platform } from 'react-native';
|
|
2
|
+
import { View, StyleSheet, BackHandler, KeyboardAvoidingView, Platform, Linking } from 'react-native';
|
|
3
3
|
import Spinner from 'react-native-loading-spinner-overlay';
|
|
4
4
|
import LinearGradient from 'react-native-linear-gradient';
|
|
5
5
|
import { Messages } from '../Messages';
|
|
@@ -483,10 +483,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
|
|
|
483
483
|
</OText>
|
|
484
484
|
<Icons>
|
|
485
485
|
<TouchableOpacity
|
|
486
|
-
onPress={() =>
|
|
487
|
-
|
|
488
|
-
store: businessData?.slug,
|
|
489
|
-
})
|
|
486
|
+
onPress={() => order?.business?.cellphone &&
|
|
487
|
+
Linking.openURL(`tel:${order?.business?.cellphone}`)
|
|
490
488
|
}
|
|
491
489
|
style={{ paddingEnd: 5 }}>
|
|
492
490
|
<OIcon
|
|
@@ -314,6 +314,41 @@ export const UserFormDetailsUI = (props: any) => {
|
|
|
314
314
|
)}
|
|
315
315
|
</WrapperPhone>
|
|
316
316
|
)}
|
|
317
|
+
<Controller
|
|
318
|
+
control={control}
|
|
319
|
+
render={() => (
|
|
320
|
+
<>
|
|
321
|
+
<OText size={14} lineHeight={21} color={theme.colors.textNormal} weight={'500'} style={{ textTransform: 'capitalize', alignSelf: 'flex-start' }}>
|
|
322
|
+
{t('PASSWORD', 'Password')}
|
|
323
|
+
</OText>
|
|
324
|
+
<OInput
|
|
325
|
+
name='password'
|
|
326
|
+
placeholder={t('FRONT_VISUALS_PASSWORD', 'Password')}
|
|
327
|
+
inputStyle={styles.inputStyle}
|
|
328
|
+
style={{ paddingLeft: 0, paddingRight: 0, marginTop: 6, height: 44, minHeight: 44 }}
|
|
329
|
+
autoCapitalize='none'
|
|
330
|
+
isDisabled={false}
|
|
331
|
+
value={
|
|
332
|
+
formState?.changes['password'] ??
|
|
333
|
+
(user && user['password']) ??
|
|
334
|
+
''
|
|
335
|
+
}
|
|
336
|
+
onChange={(val: any) => {
|
|
337
|
+
setValue('password', val.target.value)
|
|
338
|
+
handleChangeInput(val)
|
|
339
|
+
}}
|
|
340
|
+
autoCorrect
|
|
341
|
+
type='default'
|
|
342
|
+
returnKeyType="done"
|
|
343
|
+
autoCompleteType='off'
|
|
344
|
+
isSecured
|
|
345
|
+
/>
|
|
346
|
+
</>
|
|
347
|
+
)}
|
|
348
|
+
name='password'
|
|
349
|
+
rules={getInputRules({name: 'password', code: 'password'})}
|
|
350
|
+
defaultValue=''
|
|
351
|
+
/>
|
|
317
352
|
</UDWrapper>
|
|
318
353
|
)}
|
|
319
354
|
{validationFields?.loading && (
|
|
@@ -339,7 +374,7 @@ export const UserFormDetailsUI = (props: any) => {
|
|
|
339
374
|
borderColor={theme.colors.primary}
|
|
340
375
|
isDisabled={formState.loading}
|
|
341
376
|
imgRightSrc={null}
|
|
342
|
-
style={{ borderRadius: 7.6, shadowOpacity: 0, width: '100%', borderWidth: 1, marginTop: 20 }}
|
|
377
|
+
style={{ borderRadius: 7.6, shadowOpacity: 0, width: '100%', borderWidth: 1, marginTop: 20, marginBottom: 20 }}
|
|
343
378
|
onClick={handleSubmit(onSubmit)}
|
|
344
379
|
/>
|
|
345
380
|
)}
|
|
@@ -114,8 +114,9 @@ const ProfileUI = (props: ProfileParams) => {
|
|
|
114
114
|
console.log('ImagePicker Error: ', response.errorMessage);
|
|
115
115
|
showToast(ToastType.Error, response.errorMessage);
|
|
116
116
|
} else {
|
|
117
|
-
if (response
|
|
118
|
-
const
|
|
117
|
+
if (response?.assets?.length > 0) {
|
|
118
|
+
const image = response?.assets[0]
|
|
119
|
+
const url = `data:${image.type};base64,${image.base64}`
|
|
119
120
|
handleButtonUpdateClick(null, true, url);
|
|
120
121
|
} else {
|
|
121
122
|
showToast(ToastType.Error, t('IMAGE_NOT_FOUND', 'Image not found'));
|
|
@@ -33,8 +33,8 @@ export const VerifyPhone = (props: any) => {
|
|
|
33
33
|
|
|
34
34
|
const styles = StyleSheet.create({
|
|
35
35
|
inputStyle: {
|
|
36
|
-
width:
|
|
37
|
-
height:
|
|
36
|
+
width: 75,
|
|
37
|
+
height: 75,
|
|
38
38
|
marginBottom: 25,
|
|
39
39
|
borderWidth: 1,
|
|
40
40
|
borderColor: theme.colors.disabled,
|
|
@@ -50,12 +50,21 @@ export const VerifyPhone = (props: any) => {
|
|
|
50
50
|
const [timer, setTimer] = useState(`${TIME_COUNTDOWN / 60}:00`)
|
|
51
51
|
const [verifyCode, setVerifyCode] = useState({ 0: '', 1: '', 2: '', 3: '' })
|
|
52
52
|
const [isSendCodeAgain, setIsSendCodeAgain] = useState(false)
|
|
53
|
+
const inputRefs: any = [
|
|
54
|
+
React.createRef(),
|
|
55
|
+
React.createRef(),
|
|
56
|
+
React.createRef(),
|
|
57
|
+
React.createRef()
|
|
58
|
+
]
|
|
53
59
|
|
|
54
60
|
const lastNumbers = phone?.cellphone &&
|
|
55
61
|
`${phone?.cellphone.charAt(phone?.cellphone.length - 2)}${phone?.cellphone.charAt(phone?.cellphone.length - 1)}`
|
|
56
62
|
|
|
57
|
-
const
|
|
63
|
+
const goNextAfterEdit = (val: number, i: number) => {
|
|
58
64
|
setVerifyCode({ ...verifyCode, [i]: val })
|
|
65
|
+
if(val && i < inputRefs.length - 1) {
|
|
66
|
+
inputRefs[i+1].focus()
|
|
67
|
+
}
|
|
59
68
|
}
|
|
60
69
|
|
|
61
70
|
const checkResult = (result: any) => {
|
|
@@ -141,14 +150,15 @@ export const VerifyPhone = (props: any) => {
|
|
|
141
150
|
</CountDownContainer>
|
|
142
151
|
</WrappCountdown>
|
|
143
152
|
<InputsSection>
|
|
144
|
-
{
|
|
153
|
+
{inputRefs.map((k: any, idx: number) => (
|
|
145
154
|
<TextInput
|
|
146
|
-
key={
|
|
155
|
+
key={idx}
|
|
147
156
|
keyboardType='number-pad'
|
|
148
|
-
|
|
149
|
-
style={styles.inputStyle}
|
|
150
|
-
onChangeText={(val: any) => handleChangeCode(val, i)}
|
|
157
|
+
ref={r => inputRefs[idx] = r}
|
|
151
158
|
maxLength={1}
|
|
159
|
+
style={styles.inputStyle}
|
|
160
|
+
placeholder={'0'}
|
|
161
|
+
onChangeText={(val: any) => goNextAfterEdit(val, idx)}
|
|
152
162
|
editable={timer !== '00:00'}
|
|
153
163
|
/>
|
|
154
164
|
))}
|
|
@@ -173,11 +183,11 @@ export const VerifyPhone = (props: any) => {
|
|
|
173
183
|
</ErrorSection>
|
|
174
184
|
)}
|
|
175
185
|
<ResendSection>
|
|
176
|
-
<OText size={
|
|
186
|
+
<OText size={16} style={{ marginRight: 5 }}>
|
|
177
187
|
{t('ARE_YOU_NOT_SEEING_THE_CODE', 'Are you not seeing the code?')}
|
|
178
188
|
</OText>
|
|
179
189
|
<Pressable onPress={() => handleSendCodeAgain()}>
|
|
180
|
-
<OText size={
|
|
190
|
+
<OText size={16} color={theme.colors.primary}>
|
|
181
191
|
{t('SEND_AGAIN', 'Send Again')}
|
|
182
192
|
</OText>
|
|
183
193
|
</Pressable>
|
|
@@ -3,8 +3,8 @@ import styled from 'styled-components/native';
|
|
|
3
3
|
export const Container = styled.View`
|
|
4
4
|
width: 100%;
|
|
5
5
|
padding-top: 5px;
|
|
6
|
-
padding-left:
|
|
7
|
-
padding-right:
|
|
6
|
+
padding-left: 40px;
|
|
7
|
+
padding-right: 40px;
|
|
8
8
|
`
|
|
9
9
|
|
|
10
10
|
export const CountDownContainer = styled.View`
|