Skip to content

Commit 519dbcd

Browse files
thelullabyythelullabyy
committed
Merge branch 'main' of https://github.com/Expensify/App into fix/64799/negative-sign-expense
2 parents 7d247fd + 8c5ab14 commit 519dbcd

67 files changed

Lines changed: 1750 additions & 388 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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 1009017909
118-
versionName "9.1.79-9"
117+
versionCode 1009017911
118+
versionName "9.1.79-11"
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.79.9</string>
47+
<string>9.1.79.11</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.79</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.79.9</string>
16+
<string>9.1.79.11</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/ShareViewController/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.79</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.79.9</string>
16+
<string>9.1.79.11</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎package-lock.json‎

Lines changed: 2 additions & 2 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
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.79-9",
3+
"version": "9.1.79-11",
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.",

‎src/CONST/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6848,9 +6848,9 @@ const CONST = {
68486848
},
68496849
LAST_PAYMENT_METHOD: {
68506850
LAST_USED: 'lastUsed',
6851-
IOU: 'Iou',
6852-
EXPENSE: 'Expense',
6853-
INVOICE: 'Invoice',
6851+
IOU: 'iou',
6852+
EXPENSE: 'expense',
6853+
INVOICE: 'invoice',
68546854
},
68556855
SKIPPABLE_COLLECTION_MEMBER_IDS: [String(DEFAULT_NUMBER_ID), '-1', 'undefined', 'null', 'NaN'] as string[],
68566856
SETUP_SPECIALIST_LOGIN: 'Setup Specialist',

‎src/components/AvatarWithDisplayName.tsx‎

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -245,65 +245,59 @@ function AvatarWithDisplayName({
245245

246246
const shouldUseFullTitle = isMoneyRequestOrReport || isAnonymous;
247247

248-
const getAvatar = useCallback(
249-
(accountID: number) => {
250-
if (shouldShowSubscriptAvatar) {
251-
return (
252-
<SubscriptAvatar
253-
backgroundColor={avatarBorderColor}
254-
mainAvatar={icons.at(0) ?? fallbackIcon}
255-
secondaryAvatar={icons.at(1)}
256-
size={size}
257-
/>
258-
);
259-
}
260-
261-
if (!singleAvatarDetails || singleAvatarDetails.shouldDisplayAllActors || !singleAvatarDetails.reportPreviewSenderID) {
262-
return (
263-
<MultipleAvatars
264-
icons={icons}
265-
size={size}
266-
secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(avatarBorderColor)]}
267-
/>
268-
);
269-
}
270-
248+
const getAvatar = useCallback(() => {
249+
if (shouldShowSubscriptAvatar) {
271250
return (
272-
<SingleReportAvatar
273-
reportPreviewDetails={singleAvatarDetails}
274-
personalDetails={personalDetails}
275-
containerStyles={[styles.actionAvatar, styles.mr3]}
276-
actorAccountID={accountID}
251+
<SubscriptAvatar
252+
backgroundColor={avatarBorderColor}
253+
mainAvatar={icons.at(0) ?? fallbackIcon}
254+
secondaryAvatar={icons.at(1)}
255+
size={size}
277256
/>
278257
);
279-
},
280-
[StyleUtils, avatarBorderColor, icons, personalDetails, shouldShowSubscriptAvatar, singleAvatarDetails, size, styles],
281-
);
282-
283-
const getWrappedAvatar = useCallback(
284-
(accountID: number) => {
285-
const avatar = getAvatar(accountID);
286-
287-
if (!shouldEnableAvatarNavigation) {
288-
return <View accessibilityLabel={title}>{avatar}</View>;
289-
}
258+
}
290259

260+
if (!singleAvatarDetails || singleAvatarDetails.shouldDisplayAllActors || !singleAvatarDetails.reportPreviewSenderID) {
291261
return (
292-
<View accessibilityLabel={title}>
293-
<PressableWithoutFeedback
294-
onPress={showActorDetails}
295-
accessibilityLabel={title}
296-
role={getButtonRole(true)}
297-
>
298-
{avatar}
299-
</PressableWithoutFeedback>
300-
</View>
262+
<MultipleAvatars
263+
icons={icons}
264+
size={size}
265+
secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(avatarBorderColor)]}
266+
/>
301267
);
302-
},
303-
[getAvatar, shouldEnableAvatarNavigation, showActorDetails, title],
304-
);
268+
}
269+
270+
return (
271+
<SingleReportAvatar
272+
reportPreviewDetails={singleAvatarDetails}
273+
personalDetails={personalDetails}
274+
containerStyles={[styles.actionAvatar, styles.mr3]}
275+
actorAccountID={singleAvatarDetails.reportPreviewSenderID}
276+
/>
277+
);
278+
}, [StyleUtils, avatarBorderColor, icons, personalDetails, shouldShowSubscriptAvatar, singleAvatarDetails, size, styles]);
279+
280+
const getWrappedAvatar = useCallback(() => {
281+
const avatar = getAvatar();
282+
283+
if (!shouldEnableAvatarNavigation) {
284+
return <View accessibilityLabel={title}>{avatar}</View>;
285+
}
305286

306-
const WrappedAvatar = getWrappedAvatar(actorAccountID?.current ?? CONST.DEFAULT_NUMBER_ID);
287+
return (
288+
<View accessibilityLabel={title}>
289+
<PressableWithoutFeedback
290+
onPress={showActorDetails}
291+
accessibilityLabel={title}
292+
role={getButtonRole(true)}
293+
>
294+
{avatar}
295+
</PressableWithoutFeedback>
296+
</View>
297+
);
298+
}, [getAvatar, shouldEnableAvatarNavigation, showActorDetails, title]);
299+
300+
const WrappedAvatar = getWrappedAvatar();
307301

308302
const headerView = (
309303
<View style={[styles.appContentHeaderTitle, styles.flex1]}>

‎src/components/Button/index.tsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,19 @@ function Button(
310310
const textComponent = secondLineText ? (
311311
<View style={[styles.alignItemsCenter, styles.flexColumn, styles.flexShrink1]}>
312312
{primaryText}
313-
<Text style={[isLoading && styles.opacity0, styles.pointerEventsNone, styles.fontWeightNormal, styles.textDoubleDecker]}>{secondLineText}</Text>
313+
<Text
314+
style={[
315+
isLoading && styles.opacity0,
316+
styles.pointerEventsNone,
317+
styles.fontWeightNormal,
318+
styles.textDoubleDecker,
319+
!!secondLineText && styles.textExtraSmallSupporting,
320+
styles.textWhite,
321+
styles.textBold,
322+
]}
323+
>
324+
{secondLineText}
325+
</Text>
314326
</View>
315327
) : (
316328
primaryText

0 commit comments

Comments
 (0)