From bc2f73886465c5b2c6069915d0623df3c1a6f876 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Mon, 27 Sep 2021 23:42:49 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Android=20build=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref: https://react-native-community.github.io/upgrade-helper/?from=0.59.0&to=0.66.0-rc.4 --- README.md | 4 ++++ package.json | 2 +- src/modules/membership/Proof.js | 5 ++++- src/modules/membership/useProof.js | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ebff242..f835c52 100644 --- a/README.md +++ b/README.md @@ -54,3 +54,7 @@ We use fastlane and certificate management via fastlane match. Ask nikolai@stude ## Libraries We use https://nativebase.io/ for generic UI components + + +## TODO upgrade: + - `@react-native-community/eslint-config"` \ No newline at end of file diff --git a/package.json b/package.json index c083537..19cf79d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "lint": "eslint --quiet src", "release:android": "cd android && bundle exec fastlane beta", "release:ios": "cd ios && bundle exec fastlane beta", - "start": "node node_modules/react-native/local-cli/cli.js start", + "start": "react-native start", "test": "jest" }, "dependencies": { diff --git a/src/modules/membership/Proof.js b/src/modules/membership/Proof.js index 6ac595f..13400c8 100644 --- a/src/modules/membership/Proof.js +++ b/src/modules/membership/Proof.js @@ -122,7 +122,10 @@ const MembershipName = ({ user }) => { const Proof = ({ onLogoutPress, user, fetchUser, isFetchingUserData }) => { const CONFETTI_TIMEOUT = 15000; const confettiRef = useRef(null); - const { chargeError, isChargingMembership, isLoadingMembershipType, onChargePress, membershipPrice } = useProof(); + const { chargeError, isChargingMembership, isLoadingMembershipType, onChargePress, membershipPrice } = useProof({ + user, + fetchUser, + }); useEffect(() => { return () => { diff --git a/src/modules/membership/useProof.js b/src/modules/membership/useProof.js index 996b542..8fd60ab 100644 --- a/src/modules/membership/useProof.js +++ b/src/modules/membership/useProof.js @@ -27,7 +27,6 @@ function getPrice(membershipTypes) { return membershipTypes[0].price / 100; } -// FIXME: where do these come from? const useProof = ({ user, fetchUser }) => { const dispatch = useDispatch(); const { userToken, isChargingMembership, chargeError } = useSelector((state) => ({