From 2fa1f44eabf128331f3fb925783187882de133b4 Mon Sep 17 00:00:00 2001 From: Megha Mallya Date: Sun, 28 Apr 2019 14:14:11 -0500 Subject: [PATCH 1/2] made small changes --- c2tc-mobile/screens/TipOverviewScreen.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/c2tc-mobile/screens/TipOverviewScreen.js b/c2tc-mobile/screens/TipOverviewScreen.js index dd101f3..125c98b 100644 --- a/c2tc-mobile/screens/TipOverviewScreen.js +++ b/c2tc-mobile/screens/TipOverviewScreen.js @@ -79,7 +79,8 @@ class TipOverviewScreen extends React.Component { if (this.state.hasLoaded) { let tipsResponse = await API.getVerifiedTips(); this.setState({ tips: tipsResponse }); - // await AsyncStorage.removeItem("verifiedPin"); + await AsyncStorage.removeItem("token"); + await AsyncStorage.removeItem("verifiedPin"); let token = await AsyncStorage.getItem("token"); let verifiedPin = await AsyncStorage.getItem("verifiedPin"); let user; From aab75ec9e445198ad41ed9c0642cb0190a55b228 Mon Sep 17 00:00:00 2001 From: Megha Mallya Date: Thu, 2 May 2019 14:06:48 -0500 Subject: [PATCH 2/2] minor changes --- c2tc-mobile/components/Tag.js | 2 +- c2tc-mobile/screens/ProfileScreen.js | 4 ++-- c2tc-mobile/screens/TipOverviewScreen.js | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/c2tc-mobile/components/Tag.js b/c2tc-mobile/components/Tag.js index 5246858..4ad4927 100644 --- a/c2tc-mobile/components/Tag.js +++ b/c2tc-mobile/components/Tag.js @@ -21,7 +21,7 @@ class Tag extends React.Component { const styles = StyleSheet.create({ tag: { minWidth: 50, - maxWidth: 100, + maxWidth: 150, borderRadius: 5, padding: 5, alignItems: "center", diff --git a/c2tc-mobile/screens/ProfileScreen.js b/c2tc-mobile/screens/ProfileScreen.js index 1b67186..95d907c 100644 --- a/c2tc-mobile/screens/ProfileScreen.js +++ b/c2tc-mobile/screens/ProfileScreen.js @@ -44,7 +44,7 @@ export default class ProfileScreen extends React.Component { displayName: user.username, user, karmaScore: user.karma, - verified: user.verified, + verified: user.trusted, anonymousToOthers: user.anon, email: user.email, proPic: user.pro_pic @@ -91,7 +91,7 @@ export default class ProfileScreen extends React.Component { let data = { anon: anonymousToOthers }; - await API.updateUser(this.state.user_id, data); + await API.updateUser(this.state.token, data); } render() { diff --git a/c2tc-mobile/screens/TipOverviewScreen.js b/c2tc-mobile/screens/TipOverviewScreen.js index 5e23510..8ef22e5 100644 --- a/c2tc-mobile/screens/TipOverviewScreen.js +++ b/c2tc-mobile/screens/TipOverviewScreen.js @@ -49,7 +49,10 @@ class TipOverviewScreen extends React.Component { } async componentWillMount() { - // await AsyncStorage.removeItem("token"); + + await AsyncStorage.removeItem("token"); + await AsyncStorage.removeItem("verifiedPin"); + this.setDate(); this.setGreeting(); let tipsResponse = await API.getVerifiedTips(); @@ -71,6 +74,7 @@ class TipOverviewScreen extends React.Component { proPic: user.pro_pic, verifiedPin: verifiedPin }); + } } @@ -79,8 +83,6 @@ class TipOverviewScreen extends React.Component { if (this.state.hasLoaded) { let tipsResponse = await API.getVerifiedTips(); this.setState({ tips: tipsResponse }); - await AsyncStorage.removeItem("token"); - await AsyncStorage.removeItem("verifiedPin"); let token = await AsyncStorage.getItem("token"); let verifiedPin = await AsyncStorage.getItem("verifiedPin"); let user;