Skip to content

Commit 7686a5b

Browse files
committed
Merge branch 'main' of github.com:Expensify/App into jsenyitko-revert-conflicts
2 parents 39ee1c2 + d8aac60 commit 7686a5b

40 files changed

Lines changed: 85 additions & 96 deletions

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009036601
115-
versionName "9.3.66-1"
114+
versionCode 1009036603
115+
versionName "9.3.66-3"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
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.3.66.1</string>
47+
<string>9.3.66.3</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.3.66</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.66.1</string>
16+
<string>9.3.66.3</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.3.66</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.66.1</string>
16+
<string>9.3.66.3</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.3.66-1",
3+
"version": "9.3.66-3",
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/ROUTES.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ const DYNAMIC_ROUTES = {
318318
},
319319
SPEND_CATEGORY_SELECTOR: {
320320
path: 'spend-category-selector/:groupID',
321-
entryScreens: [SCREENS.WORKSPACE.CATEGORIES_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_SETTINGS],
321+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_SETTINGS],
322322
getRoute: (groupID: string) => `spend-category-selector/${groupID}` as const,
323323
},
324324
DEFAULT_CATEGORY_SELECTOR: {

src/components/MoneyRequestHeaderSecondaryActions.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
140140
const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
141141
const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
142142
const [betas] = useOnyx(ONYXKEYS.BETAS);
143+
const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
143144

144145
// Custom hooks
145146
const defaultExpensePolicy = useDefaultExpensePolicy();
@@ -233,6 +234,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
233234
personalDetails,
234235
recentWaypoints,
235236
targetPolicyTags,
237+
conciergeReportID,
236238
currentUserAccountID: accountID,
237239
currentUserLogin: currentUserLogin ?? '',
238240
});

src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function MoneyRequestReportTransactionItem({
148148
}}
149149
disabled={isTransactionPendingDelete(transaction)}
150150
ref={viewRef}
151-
wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected)]}
151+
wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && !isLastItem && styles.borderBottom]}
152152
>
153153
{({hovered}) => (
154154
<TransactionItemRow

0 commit comments

Comments
 (0)