Merge pull request #1529 from esteemapp/bugfix/benef

Fixes beneficiaries list, startup issue, comment space, tag alignment, empty tag

android/app/build.gradle

@@ -79,7 +79,7 @@ import com.android.build.OutputFile
 
 project.ext.react = [
     entryFile: "index.js",
-    enableHermes: false,  // clean and rebuild if changing
+    enableHermes: true,  // clean and rebuild if changing
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -148,8 +148,13 @@ android {
         multiDexEnabled true
         // react-native-image-crop-picker
         vectorDrawables.useSupportLibrary = true
+        ndk {
+            abiFilters "armeabi-v7a",'x86',"arm64-v8a",'x86_64'
+        }
+    }
+    dexOptions {
+        javaMaxHeapSize "4g"
     }
-    
     splits {
         abi {
             reset()
@@ -194,6 +199,10 @@ android {
     }
 
     packagingOptions {
+        exclude '**/libjscexecutor.so'
+        exclude '**/libhermes-inspector.so'
+        exclude '**/libhermes-executor-debug.so'
+        
         pickFirst '**/armeabi-v7a/libc++_shared.so'
         pickFirst '**/x86/libc++_shared.so'
         pickFirst '**/arm64-v8a/libc++_shared.so'

src/components/comments/view/commentStyles.js

@@ -2,7 +2,7 @@ import EStyleSheet from 'react-native-extended-stylesheet';
 
 export default EStyleSheet.create({
   list: {
-    marginBottom: 20,
+    marginBottom: 0,
   },
   moreRepliesButtonWrapper: {
     backgroundColor: '$iconColor',

src/components/popoverWrapper/popoverWrapperStyles.js

@@ -18,9 +18,7 @@ export default EStyleSheet.create({
     justifyContent: 'space-between',
     alignItems: 'center',
   },
-  overlay: {
-    backgroundColor: '#403c4449',
-  },
+  overlay: {},
   popoverText: {
     color: '$primaryDarkText',
   },

src/components/postElements/headerDescription/view/postHeaderDescription.js

@@ -70,7 +70,7 @@ class PostHeaderDescription extends PureComponent {
               />
             )}
           </TouchableOpacity>
-          <View style={styles.details}>
+          <View style={styles.leftContainer}>
             <View style={styles.primaryDetails}>
               <TouchableOpacity
                 style={styles.avatarNameWrapper}
@@ -79,11 +79,6 @@ class PostHeaderDescription extends PureComponent {
                 <Text style={styles.name}>{name}</Text>
                 <Text style={styles.reputation}>{_reputationText}</Text>
               </TouchableOpacity>
-              {!!tag && (
-                <TouchableOpacity onPress={() => tagOnPress && tagOnPress()}>
-                  <Tag isPostCardTag={!isPromoted} isPin value={tag} />
-                </TouchableOpacity>
-              )}
               {isShowOwnerIndicator && (
                 <Icon style={styles.ownerIndicator} name="stars" iconType="MaterialIcons" />
               )}
@@ -94,6 +89,13 @@ class PostHeaderDescription extends PureComponent {
               </Text>
             </View>
           </View>
+          <View style={styles.rightContainer}>
+            {!!tag && (
+              <TouchableOpacity onPress={() => tagOnPress && tagOnPress()}>
+                <Tag isPostCardTag={!isPromoted} isPin value={tag} />
+              </TouchableOpacity>
+            )}
+          </View>
         </View>
       </View>
     );

src/components/postElements/headerDescription/view/postHeaderDescriptionStyles.js

@@ -5,7 +5,7 @@ export default EStyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
   },
-  details: {
+  leftContainer: {
     flexDirection: 'column',
   },
   primaryDetails: {
@@ -15,6 +15,11 @@ export default EStyleSheet.create({
     flexDirection: 'row',
     marginHorizontal: 3,
   },
+  rightContainer: {
+    flexDirection: 'column',
+    marginLeft: 'auto',
+    paddingLeft: 20,
+  },
   avatar: {
     borderColor: '$borderColor',
     borderWidth: 1,

src/components/upvote/view/upvoteStyles.js

@@ -23,7 +23,7 @@ export default EStyleSheet.create({
   },
   popoverDetails: {
     flexDirection: 'row',
-    height: 100,
+    height: 'auto',
     borderRadius: 20,
     paddingHorizontal: 26,
     backgroundColor: '$primaryBackgroundColor',
@@ -72,9 +72,7 @@ export default EStyleSheet.create({
   hideArrow: {
     borderTopColor: 'transparent',
   },
-  overlay: {
-    backgroundColor: '#403c4449',
-  },
+  overlay: {},
   payoutValue: {
     alignSelf: 'center',
     fontSize: 10,

src/screens/application/container/applicationContainer.js

@@ -82,7 +82,7 @@ export const setPreviousAppState = () => {
   const appStateTimeout = setTimeout(() => {
     previousAppState = AppState.currentState;
     clearTimeout(appStateTimeout);
-  }, 2000);
+  }, 500);
 };
 
 class ApplicationContainer extends Component {
@@ -138,7 +138,6 @@ class ApplicationContainer extends Component {
     if (!isIos) BackHandler.removeEventListener('hardwareBackPress', this._onBackPress);
 
     // NetInfo.isConnected.removeEventListener('connectionChange', this._handleConntectionChange);
-    //clearInterval(this.globalInterval);
 
     Linking.removeEventListener('url', this._handleOpenURL);
 
@@ -156,11 +155,9 @@ class ApplicationContainer extends Component {
       const { isConnected, dispatch } = this.props;
       if (state.isConnected !== isConnected) {
         dispatch(setConnectivityStatus(state.isConnected));
-        this._fetchApp();
-        /*if (!state.isConnected) {
-          clearInterval(this.globalInterval);
-        }*/
+        //this._fetchApp();
       }
+      this._fetchApp();
     });
   };
 
@@ -217,7 +214,6 @@ class ApplicationContainer extends Component {
   _handleAppStateChange = nextAppState => {
     const { appState } = this.state;
     const { isPinCodeOpen: _isPinCodeOpen } = this.props;
-
     getExistUser().then(isExistUser => {
       if (isExistUser) {
         if (appState.match(/active|forground/) && nextAppState === 'inactive') {
@@ -257,7 +253,6 @@ class ApplicationContainer extends Component {
     const { isConnected } = this.props;
     if (isConnected && userRealmObject) {
       await this._fetchUserDataFromDsteem(userRealmObject);
-      //this.globalInterval = setInterval(this._refreshGlobalProps, 180000);
     }
   };
 
@@ -617,7 +612,6 @@ class ApplicationContainer extends Component {
 
     if (isConnected !== null && isConnected !== nextProps.isConnected && nextProps.isConnected) {
       this._fetchApp();
-      //this.globalInterval = setInterval(this._refreshGlobalProps, 180000);
     }
   }
 

src/screens/editor/container/editorContainer.js

@@ -234,7 +234,9 @@ class EditorContainer extends Component {
       this.setState({ isPostSending: true });
 
       const meta = extractMetadata(fields.body);
-      const jsonMeta = makeJsonMetadata(meta, fields.tags);
+      const _tags = fields.tags.filter(tag => tag && tag !== ' ');
+
+      const jsonMeta = makeJsonMetadata(meta, _tags);
       // TODO: check if permlink is available github: #314 https://github.com/esteemapp/esteem-mobile/pull/314
       let permlink = generatePermlink(fields.title);
 
@@ -251,7 +253,7 @@ class EditorContainer extends Component {
 
       const author = currentAccount.name;
       const options = makeOptions(author, permlink);
-      const parentPermlink = fields.tags[0] || 'hive-125125';
+      const parentPermlink = _tags[0] || 'hive-125125';
 
       if (scheduleDate) {
         await this._setScheduledPost({

src/utils/editor.js

@@ -96,7 +96,7 @@ export const makeJsonMetadataReply = tags => ({
   tags,
   app: `esteem/${VersionNumber.appVersion}-mobile`,
   format: 'markdown+html',
-  community: 'esteem.app',
+  community: 'hive-125125',
 });
 
 export const makeJsonMetadata = (meta, tags) =>
@@ -104,7 +104,7 @@ export const makeJsonMetadata = (meta, tags) =>
     tags,
     app: `esteem/${VersionNumber.appVersion}-mobile`,
     format: 'markdown+html',
-    community: 'esteem.app',
+    community: 'hive-125125',
   });
 
 export const makeJsonMetadataForUpdate = (oldJson, meta, tags) => {