Merge pull request #314 from Mikunj/fix/minor-bug-fixes

[Fix]Minor bug fixes

src/routes/library.js

@@ -4,17 +4,13 @@ import { StackNavigator } from 'react-navigation';
 import library from 'kitsu/assets/img/tabbar_icons/library.png';
 import { LibraryScreen } from 'kitsu/screens/Library/LibraryScreen';
 import { navigationBarHeight, statusBarHeight } from 'kitsu/constants/app';
-import { LibrarySettings } from 'kitsu/screens/Library/LibrarySettings';
 import navigationOptions from './navigationOptions';
 import { commonRoutes } from './common';
 
 const LibraryStack = StackNavigator({
   LibraryScreen: {
     screen: LibraryScreen,
   },
-  LibrarySettings: {
-    screen: LibrarySettings,
-  },
   ...commonRoutes,
 },
 {

src/routes/sidebar.js

@@ -3,7 +3,7 @@ import {
   SettingsScreen,
   GeneralSettings,
   PrivacySettings,
-  LibraryScreen,
+  LibrarySettings,
   Blocking,
   LinkedAccounts,
   ImportLibrary,
@@ -23,7 +23,7 @@ export const sidebarRoutes = {
     screen: PrivacySettings,
   },
   LibrarySettings: {
-    screen: LibraryScreen,
+    screen: LibrarySettings,
   },
   Blocking: {
     screen: Blocking,

src/screens/Auth/AuthScreen.js

@@ -22,6 +22,7 @@ import { createUser } from 'kitsu/store/user/actions';
 import { TERMS_URL } from 'kitsu/constants/app';
 import isEmpty from 'lodash/isEmpty';
 import moment from 'moment';
+import { Sentry } from 'react-native-sentry';
 import AuthWrapper from './AuthWrapper';
 import styles from './styles';
 
@@ -109,6 +110,11 @@ class AuthScreen extends React.Component {
         }
       },
       (error) => {
+        Sentry.captureMessage('FBSDK - Facebook Login Failed', {
+          extra: {
+            error,
+          },
+        });
         console.log(`Login fail with error: ${error}`);
       },
     );

src/screens/Intro/RegistrationScreen.js

@@ -8,6 +8,7 @@ import { loginUser } from 'kitsu/store/auth/actions';
 import * as colors from 'kitsu/constants/colors';
 import { placeholderImage } from 'kitsu/assets/img/intro';
 import { kitsuConfig } from 'kitsu/config/env';
+import { Sentry } from 'react-native-sentry';
 import { IntroHeader } from './common/';
 import styles from './styles';
 
@@ -77,6 +78,11 @@ class RegistrationScreen extends React.Component {
       },
       (error) => {
         this.setState({ loggingUser: false });
+        Sentry.captureMessage('FBSDK - Facebook Login Failed', {
+          extra: {
+            error,
+          },
+        });
         console.log(`Login fail with error: ${error}`);
       },
     );

src/screens/Library/LibraryScreen/component.js

@@ -58,7 +58,9 @@ export class LibraryScreenComponent extends PureComponent {
   onOptionPress = () => {
     const { navigation } = this.props;
     if (navigation) {
-      navigation.navigate('LibrarySettings');
+      navigation.navigate('LibrarySettings', {
+        navigateBackOnSave: true,
+      });
     }
   }
 

src/screens/Onboarding/Aozora/WelcomeScreen.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, Text, ImageBackground } from 'react-native';
+import { View, Text, ImageBackground, ScrollView } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import { Button } from 'kitsu/components/Button';
 import { NavigationActions } from 'react-navigation';
@@ -43,7 +43,10 @@ class WelcomeScreen extends React.Component {
 
     return (
       <View style={commonStyles.container}>
-        <View style={styles.contentWrapper}>
+        <ScrollView
+          style={styles.contentWrapper}
+          contentContainerStyle={{ flexGrow: 1 }}
+        >
           <Text style={[commonStyles.tutorialText, styles.tutorialText]}>
             {title}
           </Text>
@@ -63,7 +66,7 @@ class WelcomeScreen extends React.Component {
             title={"Let's get started!"}
             titleStyle={commonStyles.buttonTitleStyle}
           />
-        </View>
+        </ScrollView>
       </View>
     );
   }

src/screens/Onboarding/common/RatingSystemScreen.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, Text, TouchableOpacity } from 'react-native';
+import { View, Text, TouchableOpacity, ScrollView } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import { connect } from 'react-redux';
 import { upperFirst, toLower } from 'lodash';
@@ -91,7 +91,7 @@ class RatingSystemScreen extends React.Component {
     const { loading } = this.props;
     return (
       <View style={styles.container}>
-        <View style={styles.contentWrapper}>
+        <ScrollView style={styles.contentWrapper}>
           <Text style={styles.tutorialText}>
             How would you prefer to rate the things you’ve seen and read?
           </Text>
@@ -118,7 +118,7 @@ class RatingSystemScreen extends React.Component {
             title={`Use ${upperFirst(toLower(ratingSystem))} Ratings`}
             titleStyle={styles.buttonTitleStyle}
           />
-        </View>
+        </ScrollView>
         <View style={{ flexDirection: 'row' }}>
           <FastImage source={fox} style={{ width: 50, height: 50, zIndex: 2 }} />
           <View