diff --git a/src/components/FormErrors.js b/src/components/FormErrors.js
index b10666d..eeeb4ae 100644
--- a/src/components/FormErrors.js
+++ b/src/components/FormErrors.js
@@ -1,5 +1,6 @@
import React from 'react';
-import { Alert, HStack, Text } from 'native-base';
+import { Text } from 'react-native';
+import { Alert, HStack } from 'native-base';
const FormErrors = ({ errors }) => {
if (!Object.keys(errors).length || !['non_field_errors', 'detail'].some((errorField) => errorField in errors)) {
diff --git a/src/modules/login/Login.js b/src/modules/login/Login.js
index 39d0b78..3905ab5 100644
--- a/src/modules/login/Login.js
+++ b/src/modules/login/Login.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { Linking, StyleSheet, View } from 'react-native';
-import { ScrollView, Spinner, Text } from 'native-base';
+import { ActivityIndicator, Linking, StyleSheet, View, Text } from 'react-native';
+import { ScrollView } from 'native-base';
import { Button } from 'react-native-ui-lib';
import theme from '../../theme';
@@ -50,7 +50,7 @@ const Login = () => {
>
Glemt passord?
- {isLoggingIn && }
+ {isLoggingIn && }
);
diff --git a/src/modules/membership/Membership.js b/src/modules/membership/Membership.js
index 27f7d98..517e281 100644
--- a/src/modules/membership/Membership.js
+++ b/src/modules/membership/Membership.js
@@ -1,6 +1,5 @@
import React from 'react';
-import { View, StyleSheet } from 'react-native';
-import { Spinner } from 'native-base';
+import { View, StyleSheet, ActivityIndicator } from 'react-native';
import theme from '../../theme';
import useMembership from './useMembership';
@@ -14,7 +13,7 @@ const Membership = () => {
if (isFetchingUserData) {
return (
-
+
);
}
diff --git a/src/modules/membership/MembershipInfo.js b/src/modules/membership/MembershipInfo.js
index 37bf665..6c69bd1 100644
--- a/src/modules/membership/MembershipInfo.js
+++ b/src/modules/membership/MembershipInfo.js
@@ -1,7 +1,6 @@
import React from 'react';
import { ScrollView, Text, View, StyleSheet } from 'react-native';
-import { Text as NBText } from 'native-base';
import { Button } from 'react-native-ui-lib';
import theme from '../../theme';
@@ -14,7 +13,7 @@ const MembershipInfo = ({ onRegister, onLogin }) => (
Hva får jeg?
@@ -25,7 +24,7 @@ const MembershipInfo = ({ onRegister, onLogin }) => (
Allerede medlem?
diff --git a/src/modules/membership/Proof.js b/src/modules/membership/Proof.js
index a4bf2c9..9a538c2 100644
--- a/src/modules/membership/Proof.js
+++ b/src/modules/membership/Proof.js
@@ -1,6 +1,14 @@
import React, { useEffect, useRef } from 'react';
-import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, RefreshControl } from 'react-native';
-import { Text as NBText, Spinner } from 'native-base';
+import {
+ Image,
+ ScrollView,
+ StyleSheet,
+ Text,
+ TouchableOpacity,
+ View,
+ RefreshControl,
+ ActivityIndicator,
+} from 'react-native';
import { Button } from 'react-native-ui-lib';
import Confetti from 'react-native-confetti';
@@ -56,14 +64,14 @@ const PurchaseButton = ({ user, isChargingMembership, isLoadingMembershipType, o
return (
- {isChargingMembership && }
+ {isChargingMembership && }
Medlemskapet er gyldig i ett år
@@ -174,7 +182,7 @@ const Proof = ({ onLogoutPress, user, fetchUser, isFetchingUserData }) => {
diff --git a/src/modules/register/UserRegister.js b/src/modules/register/UserRegister.js
index 4694a11..21bc0e7 100644
--- a/src/modules/register/UserRegister.js
+++ b/src/modules/register/UserRegister.js
@@ -1,8 +1,8 @@
import React from 'react';
-import { Spinner, Text, ScrollView } from 'native-base';
+import { ScrollView } from 'native-base';
import { Button } from 'react-native-ui-lib';
-import { StyleSheet, View } from 'react-native';
+import { ActivityIndicator, StyleSheet, View, Text } from 'react-native';
import * as EmailValidator from 'email-validator';
import theme from '../../theme';
@@ -73,7 +73,7 @@ const UserRegister = () => {
- {isRegisteringUser && }
+ {isRegisteringUser && }
);