Merge pull request #4878 from Expensify/AndrewGable-cherry-pick-stagi…

…ng-4871
Expensify · Aug 27, 2021 · 2b3fe1e · 2b3fe1e
2 parents 230b728 + 7428bc6
commit 2b3fe1e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008800
-        versionName "1.0.88-0"
+        versionCode 1001008801
+        versionName "1.0.88-1"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.88.0</string>
+	<string>1.0.88.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.88.0</string>
+	<string>1.0.88.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.88-0",
+  "version": "1.0.88-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js
@@ -28,7 +28,7 @@ const BaseAnchorForCommentsOnly = ({
         props.isAttachment
             ? (
                 <Pressable onPress={() => {
-                    fileDownload(href);
+                    fileDownload(href, fileName);
                 }}
                 >
                     <AttachmentView

diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js
@@ -25,7 +25,7 @@ const BaseAnchorForCommentsOnly = ({
         isAttachment
             ? (
                 <Pressable onPress={() => {
-                    fileDownload(href);
+                    fileDownload(href, fileName);
                 }}
                 >
                     <AttachmentView

diff --git a/src/components/AttachmentView.js b/src/components/AttachmentView.js
@@ -10,6 +10,7 @@ import {Paperclip, Download} from './Icon/Expensicons';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import Text from './Text';
+import Tooltip from './Tooltip';
 
 const propTypes = {
     /** URL to full-sized attachment */
@@ -63,9 +64,11 @@ const AttachmentView = (props) => {
             </View>
             <Text style={[styles.textStrong]}>{props.file && props.file.name}</Text>
             {props.shouldShowDownloadIcon && (
-                <View style={styles.ml2}>
-                    <Icon src={Download} />
-                </View>
+                <Tooltip text={props.translate('common.download')}>
+                    <View style={styles.ml2}>
+                        <Icon src={Download} />
+                    </View>
+                </Tooltip>
             )}
         </View>
     );