Browse Source

Merge branch 'main' of https://github.com/IGSD-UoW/WPD-MobileApp into main

master
analuizaff 3 years ago
parent
commit
9434d6bb4c
  1. 17
      src/app/screens/AccountScreen.js
  2. 3
      src/app/screens/RegisterScreen.js
  3. 1
      src/package.json

17
src/app/screens/AccountScreen.js

@ -15,7 +15,22 @@ function UserHeader({ name, fone }) {
const index = utils.hashPhoneNumber(fone) % assets.avatar.length || 2 const index = utils.hashPhoneNumber(fone) % assets.avatar.length || 2
const Avatar = assets.avatar[index]; const Avatar = assets.avatar[index];
const _mask = fone?.length >= 12 ? "(999) 99999-9999" : "(99) 99999-9999";
var _mask = "";
switch (fone?.length) {
case 12:
_mask = "(999) 99999-9999" ;
break;
case 11:
_mask = "(99) 99999-9999"
break;
case 10:
_mask = "(99) 9999-9999"
break;
default:
_mask = "(99) 9999-9999"
break;
}
const fone_mask = mask(fone, _mask); const fone_mask = mask(fone, _mask);
return ( return (

3
src/app/screens/RegisterScreen.js

@ -411,8 +411,7 @@ export default function RegisterScreen(props) {
} else { } else {
fieldsAreNotInUse(form, actions).then((isNotUsed) => { fieldsAreNotInUse(form, actions).then((isNotUsed) => {
if (isNotUsed) { if (isNotUsed) {
console.log("abobrinha");
// handleSubmit(form);
handleSubmit(form);
} else { } else {
console.log("scrolll"); console.log("scrolll");
scroll.scrollTo({ x: 0, y: 0, animated: true }); scroll.scrollTo({ x: 0, y: 0, animated: true });

1
src/package.json

@ -54,6 +54,7 @@
"react-native-google-places-autocomplete": "^2.4.1", "react-native-google-places-autocomplete": "^2.4.1",
"react-native-keyboard-aware-scroll-view": "^0.9.5", "react-native-keyboard-aware-scroll-view": "^0.9.5",
"react-native-maps": "0.28.0", "react-native-maps": "0.28.0",
"react-native-mask-text": "^0.5.0",
"react-native-multiple-choice": "^0.0.8", "react-native-multiple-choice": "^0.0.8",
"react-native-multiple-select-list": "^1.0.4", "react-native-multiple-select-list": "^1.0.4",
"react-native-places-input": "^1.1.7", "react-native-places-input": "^1.1.7",

Loading…
Cancel
Save