Merge branch 'master' into upvote/bugs

android/app/build.gradle

@@ -139,6 +139,12 @@ android {
     }
 }
 
+configurations.all {
+    resolutionStrategy {
+        force 'org.webkit:android-jsc:r236355'
+    }
+}
+
 dependencies {
     compile project(':react-native-version-number')
     compile project(':react-native-code-push')

android/build.gradle

@@ -44,6 +44,10 @@ allprojects {
         }
         maven { url 'https://maven.google.com' }
         maven { url "https://jitpack.io" }
+        maven {
+            // Local Maven repo containing AARs with JSC library built for Android
+            url "$rootDir/../node_modules/jsc-android/dist"
+        }
     }
 }
 

package.json

@@ -35,6 +35,7 @@
     "diff-match-patch": "^1.0.4",
     "dsteem": "^0.10.1",
     "intl": "^1.2.5",
+    "jsc-android": "^236355.1.1",
     "moment": "^2.22.2",
     "react": "^16.6.0-alpha.8af6728",
     "react-intl": "^2.7.2",

src/screens/application/container/applicationContainer.js

@@ -96,9 +96,13 @@ class ApplicationContainer extends Component {
   }
 
   _onBackPress = () => {
-    const { dispatch } = this.props;
+    const { dispatch, nav } = this.props;
 
-    dispatch(NavigationActions.back());
+    if (nav && nav[0].index !== 0) {
+      dispatch(NavigationActions.back());
+    } else {
+      BackHandler.exitApp();
+    }
     return true;
   };
 
@@ -309,4 +313,4 @@ export default connect(
       ...bindActionCreators({ fetchGlobalProperties }, dispatch),
     },
   }),
-)(ApplicationContainer);
+)(ApplicationContainer);

src/screens/profile/container/profileContainer.js

@@ -9,6 +9,7 @@ import {
   ignoreUser,
   getFollows,
   getRepliesByLastUpdate,
+  getUserComments,
   getUser,
   getIsFollowing,
   getIsMuted,
@@ -98,11 +99,20 @@ class ProfileContainer extends Component {
   }
 
   _getReplies = async (user) => {
-    await getRepliesByLastUpdate({ start_author: user, limit: 10 }).then((result) => {
-      this.setState({
-        comments: result,
+    const { isReverseHeader } = this.state;
+    if (isReverseHeader) {
+      await getUserComments({ start_author: user, limit: 10 }).then((result) => {
+        this.setState({
+          comments: result,
+        });
       });
-    });
+    } else {
+      await getRepliesByLastUpdate({ start_author: user, limit: 10 }).then((result) => {
+        this.setState({
+          comments: result,
+        });
+      });
+    }
   };
 
   _handleFollowUnfollowUser = async (isFollowAction) => {

src/screens/profile/screen/profileScreen.js

@@ -105,8 +105,8 @@ class ProfileScreen extends PureComponent {
     if (about) {
       _about = about.about;
       coverImage = about.cover_image;
-      location = about.location;
-      website = about.website;
+      ({ location } = about);
+      ({ website } = about);
     }
     return (
       <Fragment>
@@ -192,9 +192,12 @@ class ProfileScreen extends PureComponent {
               />
             </View>
             <View
-              tabLabel={intl.formatMessage({
-                id: 'profile.replies',
-              })}
+              tabLabel={isReverseHeader
+                ? intl.formatMessage({
+                  id: 'profile.comments',
+                }) : intl.formatMessage({
+                  id: 'profile.replies',
+                })}
               style={styles.commentsTabBar}
             >
               {comments && comments.length > 0 ? (

yarn.lock

@@ -5109,6 +5109,11 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
+jsc-android@^236355.1.1:
+  version "236355.1.1"
+  resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-236355.1.1.tgz#43e153b722e3c60dd0595be4e7430baf65e67c9c"
+  integrity sha512-2py4f0McZIl/oH6AzPj1Ebutc58fyeLvwq6gyVYp1RsWr4qeLNHAPfW3kmfeVMz44oUBJMQ0lECZg9n4KBhHbQ==
+
 jsdom@^11.5.1:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"