Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Image picker file extension #14640

Merged
merged 3 commits into from
Jan 30, 2023
Merged

Image picker file extension #14640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c941bde
Removed mime-based file extension extraction
s77rt Jan 27, 2023
2351d42
Upgraded react-native-image-picker
s77rt Jan 27, 2023
9d9ae98
Fix lint issue
s77rt Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ PODS:
- React-Core
- react-native-image-manipulator (1.0.5):
- React
- react-native-image-picker (4.10.2):
- react-native-image-picker (5.0.1):
- React-Core
- react-native-netinfo (8.3.1):
- React-Core
Expand Down Expand Up @@ -992,7 +992,7 @@ SPEC CHECKSUMS:
react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88
react-native-flipper: dc5290261fbeeb2faec1bdc57ae6dd8d562e1de4
react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56
react-native-image-picker: bf34f3f516d139ed3e24c5f5a381a91819e349ea
react-native-image-picker: 8cb4280e2c1efc3daeb2d9d597f9429a60472e40
react-native-netinfo: 1a6035d3b9780221d407c277ebfb5722ace00658
react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
react-native-performance: 224bd53e6a835fda4353302cf891d088a0af7406
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#3bbd17d63e6c38d38d857b50f6037c1c0376ff06",
"react-native-haptic-feedback": "^1.13.0",
"react-native-image-pan-zoom": "^2.1.12",
"react-native-image-picker": "^4.10.2",
"react-native-image-picker": "^5.0.1",
"react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
"react-native-modal": "^13.0.0",
"react-native-onyx": "1.0.36",
Expand Down
7 changes: 1 addition & 6 deletions src/components/AttachmentPicker/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {Alert, Linking, View} from 'react-native';
import {launchImageLibrary} from 'react-native-image-picker';
import RNDocumentPicker from 'react-native-document-picker';
import RNFetchBlob from 'react-native-blob-util';
import Str from 'expensify-common/lib/str';
import {propTypes as basePropTypes, defaultProps} from './attachmentPickerPropTypes';
import styles from '../../styles/styles';
import Popover from '../Popover';
Expand Down Expand Up @@ -66,11 +65,7 @@ const documentPickerOptions = {
* @return {Promise}
*/
function getDataForUpload(fileData) {
let fileName = fileData.fileName || fileData.name || 'chat_attachment';
const fileExtension = `.${_.last(fileData.type.split('/'))}`;
if (!Str.endsWith(fileName, fileExtension)) {
fileName = `${fileName}${fileExtension}`;
}
const fileName = fileData.fileName || fileData.name || 'chat_attachment';
s77rt marked this conversation as resolved.
Show resolved Hide resolved
const fileResult = {
name: fileName,
type: fileData.type,
Expand Down