Skip to content

Commit 381ae7c

Browse files
authored
Merge pull request Expensify#66916 from ikevin127/ikevin127-genmojiAttachmentSupport
[iOS 18.2+] Feature: Add Genmoji / Sticker Support as Attachments
2 parents fa8f507 + 687c7b6 commit 381ae7c

3 files changed

Lines changed: 48 additions & 45 deletions

File tree

package-lock.json

Lines changed: 42 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@expensify/nitro-utils": "file:./modules/ExpensifyNitroUtils",
8888
"@expensify/react-native-background-task": "file:./modules/background-task",
8989
"@expensify/react-native-hybrid-app": "file:./modules/hybrid-app",
90-
"@expensify/react-native-live-markdown": "0.1.294",
90+
"@expensify/react-native-live-markdown": "0.1.298",
9191
"@expensify/react-native-wallet": "^0.1.5",
9292
"@expo/metro-runtime": "^5.0.4",
9393
"@firebase/app": "^0.13.2",

src/components/Composer/implementation/index.native.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {containsOnlyEmojis} from '@libs/EmojiUtils';
1515
import {splitExtensionFromFileName} from '@libs/fileDownload/FileUtils';
1616
import Parser from '@libs/Parser';
1717
import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
18+
import getFileSize from '@pages/Share/getFileSize';
1819
import CONST from '@src/CONST';
1920

2021
const excludeNoStyles: Array<keyof MarkdownStyle> = [];
@@ -102,8 +103,10 @@ function Composer(
102103
const {fileName: stem, fileExtension: originalFileExtension} = splitExtensionFromFileName(baseFileName);
103104
const fileExtension = originalFileExtension || (mimeDb[mimeType].extensions?.[0] ?? 'bin');
104105
const fileName = `${stem}.${fileExtension}`;
105-
const file: FileObject = {uri: fileURI, name: fileName, type: mimeType};
106-
onPasteFile(file);
106+
let file: FileObject = {uri: fileURI, name: fileName, type: mimeType, size: 0};
107+
getFileSize(file.uri ?? '')
108+
.then((size) => (file = {...file, size}))
109+
.finally(() => onPasteFile(file));
107110
},
108111
[onPasteFile],
109112
);

0 commit comments

Comments
 (0)