Merge remote-tracking branch 'origin' into mark-all-notifications-as-read

Author: lex111

App.js

@@ -59,7 +59,11 @@ class App extends Component {
 
     persistStore(
       configureStore,
-      { storage: AsyncStorage, transforms: [encryptor] },
+      {
+        storage: AsyncStorage,
+        transforms: [encryptor],
+        blacklist: ['user'],
+      },
       () => {
         this.setState({ rehydrated: true });
       }

routes.js

@@ -56,6 +56,7 @@ import {
   IssueSettingsScreen,
   NewIssueScreen,
   PullMergeScreen,
+  EditIssueCommentScreen,
 } from 'issue';
 
 const sharedRoutes = {
@@ -158,6 +159,12 @@ const sharedRoutes = {
       title: navigation.state.params.title,
     }),
   },
+  EditIssueComment: {
+    screen: EditIssueCommentScreen,
+    navigationOptions: ({ navigation }) => ({
+      title: navigation.state.params.title,
+    }),
+  },
   PullDiff: {
     screen: PullDiffScreen,
     navigationOptions: ({ navigation }) => ({
@@ -255,49 +262,53 @@ const MainTabNavigator = TabNavigator(
     Home: {
       screen: HomeStackNavigator,
       navigationOptions: {
-        tabBarIcon: ({ tintColor }) =>
+        tabBarIcon: ({ tintColor }) => (
           <Icon
             containerStyle={{ justifyContent: 'center', alignItems: 'center' }}
             color={tintColor}
             name="home"
             size={33}
-          />,
+          />
+        ),
       },
     },
     Notifications: {
       screen: NotificationsStackNavigator,
       navigationOptions: {
-        tabBarIcon: ({ tintColor }) =>
+        tabBarIcon: ({ tintColor }) => (
           <Icon
             containerStyle={{ justifyContent: 'center', alignItems: 'center' }}
             color={tintColor}
             name="notifications"
             size={33}
-          />,
+          />
+        ),
       },
     },
     Search: {
       screen: SearchStackNavigator,
       navigationOptions: {
-        tabBarIcon: ({ tintColor }) =>
+        tabBarIcon: ({ tintColor }) => (
           <Icon
             containerStyle={{ justifyContent: 'center', alignItems: 'center' }}
             color={tintColor}
             name="search"
             size={33}
-          />,
+          />
+        ),
       },
     },
     MyProfile: {
       screen: MyProfileStackNavigator,
       navigationOptions: {
-        tabBarIcon: ({ tintColor }) =>
+        tabBarIcon: ({ tintColor }) => (
           <Icon
             containerStyle={{ justifyContent: 'center', alignItems: 'center' }}
             color={tintColor}
             name="person"
             size={33}
-          />,
+          />
+        ),
       },
     },
   },
@@ -309,7 +320,7 @@ const MainTabNavigator = TabNavigator(
       activeTintColor: colors.primaryDark,
       inactiveTintColor: colors.grey,
     },
-    tabBarComponent: ({ jumpToIndex, ...props }) =>
+    tabBarComponent: ({ jumpToIndex, ...props }) => (
       <TabBarBottom
         {...props}
         jumpToIndex={index => {
@@ -335,7 +346,8 @@ const MainTabNavigator = TabNavigator(
             jumpToIndex(index);
           }
         }}
-      />,
+      />
+    ),
   }
 );
 

src/api/index.js

@@ -194,6 +194,30 @@ export const fetchPostIssueComment = (
     { body }
   );
 
+export const fetchDeleteIssueComment = (
+  issueCommentId,
+  owner,
+  repoName,
+  accessToken
+) =>
+  v3.delete(
+    `/repos/${owner}/${repoName}/issues/comments/${issueCommentId}`,
+    accessToken
+  );
+
+export const fetchEditIssueComment = (
+  issueCommentId: number,
+  owner: string,
+  repoName: string,
+  editParams: any,
+  accessToken: string
+) =>
+  v3.patch(
+    `/repos/${owner}/${repoName}/issues/comments/${issueCommentId}`,
+    accessToken,
+    editParams
+  );
+
 export const fetchEditIssue = (
   owner,
   repoName,

src/auth/auth.reducer.js

@@ -84,7 +84,6 @@ export const authReducer = (state = initialState, action = {}) => {
     case GET_AUTH_STAR_COUNT.PENDING:
       return {
         ...state,
-        starCount: ' ',
         isPendingStarCount: true,
       };
     case GET_AUTH_STAR_COUNT.SUCCESS:

src/auth/screens/auth-profile.screen.js

@@ -123,7 +123,7 @@ class AuthProfile extends Component {
               type="user"
               initialUser={hasInitialUser ? user : {}}
               user={hasInitialUser ? user : {}}
-              starCount={starCount}
+              starCount={hasInitialUser ? starCount : ''}
               language={language}
               navigation={navigation}
             />}

src/auth/screens/language-settings.js

@@ -1,27 +1,32 @@
 export default [
   {
     code: 'en',
-    emojiCode: 'us',
+    emojiCode: ':flag-us:',
     name: 'English',
   },
   {
     code: 'fr',
+    emojiCode: ':flag-fr:',
     name: 'Français',
   },
   {
     code: 'nl',
+    emojiCode: ':flag-nl:',
     name: 'Nederlands',
   },
   {
     code: 'tr',
+    emojiCode: ':flag-tr:',
     name: 'Türkçe',
   },
   {
     code: 'pt-br',
+    emojiCode: ':flag-br:',
     name: 'Português do Brasil',
   },
   {
     code: 'ru',
+    emojiCode: ':flag-ru:',
     name: 'Русский',
   },
 ];

src/auth/screens/user-options.screen.js

@@ -67,6 +67,13 @@ const styles = StyleSheet.create({
     paddingRight: 7,
     color: colors.black, // random any color for the correct display emoji
   },
+  containerStyle: {
+    paddingTop: 0,
+    paddingBottom: 0,
+    height: 45,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
 });
 
 const updateText = lang => ({
@@ -152,21 +159,20 @@ class UserOptions extends Component {
             <FlatList
               data={languages}
               renderItem={({ item }) => {
-                const langCode = item.emojiCode || item.code.substring(0, 2);
-
                 return (
                   <ListItem
                     title={
                       <View style={styles.language}>
                         <Text style={styles.flag}>
-                          {emojifyText(`:flag-${langCode}:`)}
+                          {emojifyText(item.emojiCode)}
                         </Text>
                         <Text style={styles.listTitle}>
                           {item.name}
                         </Text>
                       </View>
                     }
                     titleStyle={styles.listTitle}
+                    containerStyle={styles.containerStyle}
                     hideChevron={language !== item.code}
                     rightIcon={{ name: 'check' }}
                     onPress={() => changeLanguage(item.code)}