From d4b81ff8e85db9b4990be643c7d10824d7e054cc Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Sat, 18 Nov 2017 18:54:16 +0100
Subject: [PATCH] Proof: Prevent charge if no membershiptype

---
 src/modules/membership/Membership.js          | 8 ++++++++
 src/modules/membership/MembershipContainer.js | 6 +++++-
 src/modules/membership/Proof.js               | 2 +-
 src/modules/membership/ProofContainer.js      | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/modules/membership/Membership.js b/src/modules/membership/Membership.js
index 3454958..a24cf2c 100644
--- a/src/modules/membership/Membership.js
+++ b/src/modules/membership/Membership.js
@@ -4,6 +4,14 @@ import {Button, Text as NBText} from "native-base";
 import theme from "../../theme";
 export default class Membership extends Component {
     render() {
+        if (this.props.isFetchingUserData) {
+            return (
+                <View style={styles.card}>
+                    <Spinner color="#f58220"/>
+                </View>
+            );
+        }
+
         return (
             <ScrollView>
                 <View style={styles.card}>
diff --git a/src/modules/membership/MembershipContainer.js b/src/modules/membership/MembershipContainer.js
index 8a4b2ff..fae9bf5 100644
--- a/src/modules/membership/MembershipContainer.js
+++ b/src/modules/membership/MembershipContainer.js
@@ -62,7 +62,11 @@ class MembershipContainer extends Component {
                 onLogoutPress={this.onLogoutPress}
             />;
         }
-        return <Membership onLoginPress={this.onLoginPress} onRegisterPress={this.onRegisterPress} />;
+        return <Membership
+            isFetchingUserData={this.props.isFetchingUserData}
+            onLoginPress={this.onLoginPress}
+            onRegisterPress={this.onRegisterPress}
+        />;
     }
 }
 
diff --git a/src/modules/membership/Proof.js b/src/modules/membership/Proof.js
index 0a40a50..edf4e1b 100644
--- a/src/modules/membership/Proof.js
+++ b/src/modules/membership/Proof.js
@@ -88,7 +88,7 @@ export default class Proof extends Component {
                 <Button
                     onPress={this.props.onChargePress}
                     full
-                    disabled={this.props.isChargingMembership}
+                    disabled={this.props.isChargingMembership || this.props.isLoadingMembershipType}
                     style={styles.purchaseButton}
                 >
                     <NBText>{`Kjøp medlemskap (${this.props.membershipPrice} NOK)`}</NBText>
diff --git a/src/modules/membership/ProofContainer.js b/src/modules/membership/ProofContainer.js
index 766b733..71f092a 100644
--- a/src/modules/membership/ProofContainer.js
+++ b/src/modules/membership/ProofContainer.js
@@ -15,7 +15,6 @@ stripe.init({
 
 
 class ProofContainer extends Component {
-    // TODO: Prevent charge if we do not have a default membership type
     constructor(props) {
         super(props);
         this.state = {
@@ -36,6 +35,7 @@ class ProofContainer extends Component {
             {...this.state}
             user={this.props.user}
             isChargingMembership={this.props.isChargingMembership}
+            isLoadingMembershipType={this.props.data.loading}
             chargeError={this.props.chargeError}
             onChargePress={this.openStripe}
             onLogoutPress={this.props.onLogoutPress}