Skip to content

Commit 00382d2

Browse files
c3024c3024
committed
Merge branch 'main' into add-Unicode-custom-emojis
2 parents 8788c9e + 9a1e741 commit 00382d2

26 files changed

Lines changed: 366 additions & 76 deletions

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009017409
118-
versionName "9.1.74-9"
117+
versionCode 1009017600
118+
versionName "9.1.76-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

‎ios/NewExpensify/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.1.74</string>
26+
<string>9.1.76</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.74.9</string>
47+
<string>9.1.76.0</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.74</string>
14+
<string>9.1.76</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.74.9</string>
16+
<string>9.1.76.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/Podfile.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
PODS:
2-
- Airship (19.2.1):
3-
- Airship/Automation (= 19.2.1)
4-
- Airship/Basement (= 19.2.1)
5-
- Airship/Core (= 19.2.1)
6-
- Airship/FeatureFlags (= 19.2.1)
7-
- Airship/MessageCenter (= 19.2.1)
8-
- Airship/PreferenceCenter (= 19.2.1)
9-
- Airship/Automation (19.2.1):
2+
- Airship (19.6.1):
3+
- Airship/Automation (= 19.6.1)
4+
- Airship/Basement (= 19.6.1)
5+
- Airship/Core (= 19.6.1)
6+
- Airship/FeatureFlags (= 19.6.1)
7+
- Airship/MessageCenter (= 19.6.1)
8+
- Airship/PreferenceCenter (= 19.6.1)
9+
- Airship/Automation (19.6.1):
1010
- Airship/Core
11-
- Airship/Basement (19.2.1)
12-
- Airship/Core (19.2.1):
11+
- Airship/Basement (19.6.1)
12+
- Airship/Core (19.6.1):
1313
- Airship/Basement
14-
- Airship/FeatureFlags (19.2.1):
14+
- Airship/FeatureFlags (19.6.1):
1515
- Airship/Core
16-
- Airship/MessageCenter (19.2.1):
16+
- Airship/MessageCenter (19.6.1):
1717
- Airship/Core
18-
- Airship/PreferenceCenter (19.2.1):
18+
- Airship/PreferenceCenter (19.6.1):
1919
- Airship/Core
20-
- AirshipFrameworkProxy (14.1.1):
21-
- Airship (= 19.2.1)
20+
- AirshipFrameworkProxy (14.5.1):
21+
- Airship (= 19.6.1)
2222
- AirshipServiceExtension (18.7.2)
2323
- AppAuth (1.7.5):
2424
- AppAuth/Core (= 1.7.5)
@@ -1783,8 +1783,8 @@ PODS:
17831783
- ReactCommon/turbomodule/bridging
17841784
- ReactCommon/turbomodule/core
17851785
- Yoga
1786-
- react-native-airship (24.0.0):
1787-
- AirshipFrameworkProxy (= 14.1.1)
1786+
- react-native-airship (24.4.0):
1787+
- AirshipFrameworkProxy (= 14.5.1)
17881788
- DoubleConversion
17891789
- glog
17901790
- hermes-engine
@@ -3697,8 +3697,8 @@ CHECKOUT OPTIONS:
36973697
:http: https://ios-releases.fullstory.com/fullstory-1.52.0-xcframework.tar.gz
36983698

36993699
SPEC CHECKSUMS:
3700-
Airship: a5de82c19ebca996fd8fecfcfbb3803f3de29a74
3701-
AirshipFrameworkProxy: 71ddba175bb22974cfa673d26ce8303ed6546212
3700+
Airship: aa8a8f48805425d1a292db60d79235d4a4afa1cb
3701+
AirshipFrameworkProxy: d5873f774b28d13c2189c920b4bafdb9c152f353
37023702
AirshipServiceExtension: 9c73369f426396d9fb9ff222d86d842fac76ba46
37033703
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
37043704
AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
@@ -3788,7 +3788,7 @@ SPEC CHECKSUMS:
37883788
React-Mapbuffer: c04fcda1c6281fc0a6824c7dcc1633dd217ac1ec
37893789
React-microtasksnativemodule: ca2804a25fdcefffa0aa942aa23ab53b99614a34
37903790
react-native-advanced-input-mask: d4aa4ce2496f6b75076974e90a8260c0af3c1176
3791-
react-native-airship: e400f0d3056113b167623214695f5ff6d4cb839c
3791+
react-native-airship: 1c77b61b665bcbbba4d32c57a1eaf67310aab1f0
37923792
react-native-app-logs: 6af30dbe7eee481a88380e3e66313a597ac0eaeb
37933793
react-native-blob-util: 2aeac5a5274d88310dadc1ddfd5b01f36d490bc2
37943794
react-native-cameraroll: 3d2cc0692f384ead14e5d9e2e5fbf0e6e0139163

‎ios/ShareViewController/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.74</string>
14+
<string>9.1.76</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.74.9</string>
16+
<string>9.1.76.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎package-lock.json‎

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

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.74-9",
3+
"version": "9.1.76-0",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -119,7 +119,7 @@
119119
"@react-ng/bounds-observer": "^0.2.1",
120120
"@rnmapbox/maps": "10.1.33",
121121
"@shopify/flash-list": "1.7.6",
122-
"@ua/react-native-airship": "~24.0.0",
122+
"@ua/react-native-airship": "~24.4.0",
123123
"awesome-phonenumber": "^5.4.0",
124124
"babel-polyfill": "^6.26.0",
125125
"canvas-size": "^1.2.6",
@@ -178,7 +178,7 @@
178178
"react-native-modal": "^13.0.0",
179179
"react-native-nitro-modules": "0.26.2",
180180
"react-native-nitro-sqlite": "9.1.10",
181-
"react-native-onyx": "^2.0.113",
181+
"react-native-onyx": "^2.0.117",
182182
"react-native-pager-view": "6.5.3",
183183
"react-native-pdf": "6.7.3",
184184
"react-native-performance": "^5.1.0",

‎src/CONST/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6170,6 +6170,7 @@ const CONST = {
61706170
CHAT: 'chat',
61716171
},
61726172
ACTION_FILTERS: {
6173+
APPROVE: 'approve',
61736174
PAY: 'pay',
61746175
EXPORT: 'export',
61756176
},

‎src/components/Modal/BaseModal.tsx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ function BaseModal(
109109
const insets = useSafeAreaInsets();
110110

111111
const isVisibleRef = useRef(isVisible);
112+
const hideModalCallbackRef = useRef<(callHideCallback: boolean) => void>(undefined);
113+
112114
const wasVisible = usePrevious(isVisible);
113115

114116
const uniqueModalId = useMemo(() => modalId ?? ComposerFocusManager.getId(), [modalId]);
@@ -158,6 +160,22 @@ function BaseModal(
158160
};
159161
}, [isVisible, wasVisible, onClose, type]);
160162

163+
useEffect(() => {
164+
hideModalCallbackRef.current = hideModal;
165+
}, [hideModal]);
166+
167+
useEffect(
168+
() => () => {
169+
// Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
170+
if (!isVisibleRef.current) {
171+
return;
172+
}
173+
hideModalCallbackRef.current?.(true);
174+
},
175+
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
176+
[],
177+
);
178+
161179
const handleShowModal = useCallback(() => {
162180
if (shouldSetModalVisibility) {
163181
setModalVisibility(true, type);

0 commit comments

Comments
 (0)