Merge branch 'development' into l10n_development

android/app/build.gradle

@@ -143,7 +143,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
-        versionName "3.0.16"
+        versionName "3.0.17"
         resValue "string", "build_config_package", "app.esteem.mobile.android"
         multiDexEnabled true
         // react-native-image-crop-picker

ios/Ecency-tvOS/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.16</string>
+	<string>3.0.17</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2795</string>
+	<string>2796</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>

ios/Ecency-tvOSTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.16</string>
+	<string>3.0.17</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2795</string>
+	<string>2796</string>
 </dict>
 </plist>

ios/Ecency.xcodeproj/project.pbxproj

@@ -1112,7 +1112,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2795;
+				CURRENT_PROJECT_VERSION = 2796;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 75B6RXTKGT;
 				HEADER_SEARCH_PATHS = (
@@ -1188,7 +1188,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2795;
+				CURRENT_PROJECT_VERSION = 2796;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 75B6RXTKGT;
 				HEADER_SEARCH_PATHS = (

ios/Ecency/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.16</string>
+	<string>3.0.17</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/EcencyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.16</string>
+	<string>3.0.17</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2795</string>
+	<string>2796</string>
 </dict>
 </plist>

ios/eshare/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.16</string>
+	<string>3.0.17</string>
 	<key>CFBundleVersion</key>
-	<string>2795</string>
+	<string>2796</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecency",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "displayName": "Ecency",
   "private": true,
   "rnpm": {

src/components/uploadsGalleryModal/uploadsGalleryModal.tsx

@@ -116,8 +116,22 @@ export const UploadsGalleryModal =  forwardRef(({username, handleOnSelect, handl
     }
 
     const _onRemovePress = async () => {
+        const _onConfirm = () => {
             _deleteMediaItem(item._id)
         }
+        Alert.alert(
+            intl.formatMessage({id:'alert.delete'}),
+            intl.formatMessage({id:'alert.remove_alert'}),
+            [{
+                text:intl.formatMessage({id:'alert.cancel'}),
+                style:'cancel'
+            },{
+                text:intl.formatMessage({id:'alert.confirm'}),
+                onPress:_onConfirm
+            }]
+        )
+       
+    }
 
     const thumbUrl = proxifyImageSrc(item.url, 600, 500, Platform.OS === 'ios' ? 'match' : 'webp');
 

src/config/locales/en-US.json

@@ -301,7 +301,18 @@
     "my_communities": "My Communities",
     "top_communities": "Top Communities",
     "schedule_modal_title": "Schedule Post",
-    "snippets": "Snippets"
+    "snippets": "Snippets",
+    "alert_init_title":"New Content",
+    "alert_init_body":"Open recent draft or Create new post",
+    "alert_btn_draft":"Recent Draft",
+    "alert_btn_new":"New Post",
+    "alert_pub_edit_title":"Publishing edits",
+    "alert_pub_new_title":"Publishing new post",
+    "alert_pub_body":"Are you sure?",
+    "alert_btn_yes":"Yes",
+    "alert_btn_no":"No",
+    "draft_save_success":"Draft Saved",
+    "draft_save_fail":"Failed to save draft"
   },
   "snippets":{
     "label_no_snippets":"No Snippets Found",
@@ -319,6 +330,13 @@
     "btn_confirm":"Confirm",
     "btn_cancel":"Cancel"
   },
+  "uploads_modal":{
+    "label_no_images":"No Images Found",
+    "title":"Uploaded Images",
+    "title_remove_confirmation":"Delete image",
+    "btn_add":"Image",
+    "message_failed":"Failed to upload image"
+  },
   "pincode": {
     "enter_text": "Enter PIN to unlock",
     "set_new": "Set new PIN",

src/screens/application/container/applicationContainer.js

@@ -621,7 +621,10 @@ class ApplicationContainer extends Component {
   _getSettings = async () => {
     const { dispatch } = this.props;
 
+    //reset certain properties
     dispatch(hideActionModal());
+    dispatch(toastNotification(''));
+
     const settings = await getSettings();
 
     if (settings) {

src/screens/editor/container/editorContainer.js

@@ -594,6 +594,11 @@ class EditorContainer extends Component {
   _saveCurrentDraft = async (fields) => {
     const { draftId, isReply, isEdit, isPostSending } = this.state;
 
+    //skip draft save in case post is sending or is post beign edited
+    if (isPostSending || isEdit) {
+      return;
+    }
+
     const { currentAccount } = this.props;
     const username = currentAccount && currentAccount.name ? currentAccount.name : '';
 
@@ -602,7 +607,6 @@ class EditorContainer extends Component {
       tags: fields.tags && fields.tags.length > 0 ? fields.tags.toString() : '',
     };
 
-    if (!isPostSending) {
     //save reply data
     if (isReply && draftField.body !== null) {
       await AsyncStorage.setItem('temp-reply', draftField.body);
@@ -616,7 +620,6 @@ class EditorContainer extends Component {
     else if (!isReply) {
       setDraftPost(draftField, username);
     }
-    }
   };
 
   _submitPost = async (fields, scheduleDate) => {

src/screens/editor/screen/editorScreen.js

@@ -66,8 +66,8 @@ class EditorScreen extends Component {
   }
 
   componentWillUnmount() {
-    const { isReply } = this.props;
+    const { isReply, isEdit } = this.props;
-    if (!isReply) {
+    if (!isReply && !isEdit) {
       this._saveDraftToDB();
     }
   }