From 7a67b85cbd9d58685da51490ec7b0e745fbdf802 Mon Sep 17 00:00:00 2001 From: analuizaff Date: Fri, 19 Nov 2021 14:59:43 -0300 Subject: [PATCH] restricting user action until api returns a response for PLUVIOVEMETER_REGISTRATION --- src/app/hooks/usePluviometricStation.js | 8 ++------ src/app/screens/AccountScreen.js | 3 ++- src/app/screens/PluviometerRegisterScreen.js | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/app/hooks/usePluviometricStation.js b/src/app/hooks/usePluviometricStation.js index 8e7c91e..4df75c2 100644 --- a/src/app/hooks/usePluviometricStation.js +++ b/src/app/hooks/usePluviometricStation.js @@ -7,7 +7,7 @@ async function getPluvStation_data(id) { if (result.data) { return result; } - return null; + return undefined; } function assemblePluvStationObject(pluvData) { @@ -64,14 +64,10 @@ async function getPluviometerStation(userId, setPluviometerStation) { socketObject.onerror = (e) => { console.log(e.message); - setPluviometerStation(null); + setPluviometerStation(undefined); }; socketObject.close(); - - socketObject.onclose = () => { - console.log("FECHOU"); - }; } export default getPluviometerStation; diff --git a/src/app/screens/AccountScreen.js b/src/app/screens/AccountScreen.js index 4ce5497..63eb9aa 100644 --- a/src/app/screens/AccountScreen.js +++ b/src/app/screens/AccountScreen.js @@ -102,10 +102,11 @@ function AccountScreen(props) { return true } + const profileItems = [ { icon: "account", - show: isRegistered, + show: user.pluviometer != undefined, IconProvider: MaterialCommunityIcons, title: user.pluviometer? "Dados do pluviômetro" : "Cadastrar pluviômetro", onPress: () => { diff --git a/src/app/screens/PluviometerRegisterScreen.js b/src/app/screens/PluviometerRegisterScreen.js index 7e5bc17..1006852 100644 --- a/src/app/screens/PluviometerRegisterScreen.js +++ b/src/app/screens/PluviometerRegisterScreen.js @@ -224,7 +224,7 @@ function PluviometerRegisterScreen(props) { }} > - Cadastro do Pluviômetro + {user.pluviometer? "Dados do Pluviômetro" : "Cadastro do Pluviômetro"}