Skip to content

Commit abcf176

Browse files
fabioh8010fabioh8010
committed
Merge remote-tracking branch 'origin/main' into bugfix/gh-actions-build
2 parents c370975 + 4cb61d3 commit abcf176

21 files changed

Lines changed: 79 additions & 54 deletions

File tree

‎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 1009017907
118-
versionName "9.1.79-7"
117+
versionCode 1009017908
118+
versionName "9.1.79-8"
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.7</string>
47+
<string>9.1.79.8</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.7</string>
16+
<string>9.1.79.8</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.7</string>
16+
<string>9.1.79.8</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-7",
3+
"version": "9.1.79-8",
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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,10 @@ const ROUTES = {
602602
},
603603
MONEY_REQUEST_STEP_CONFIRMATION: {
604604
route: ':action/:iouType/confirmation/:transactionID/:reportID/:backToReport?',
605-
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined, backToReport?: string, participantsAutoAssigned?: boolean, backTo?: string) =>
606-
getUrlWithBackToParam(
607-
`${action as string}/${iouType as string}/confirmation/${transactionID}/${reportID}/${backToReport ?? ''}${participantsAutoAssigned ? '?participantsAutoAssigned=true' : ''}`,
608-
backTo,
609-
),
605+
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined, backToReport?: string, participantsAutoAssigned?: boolean) =>
606+
`${action as string}/${iouType as string}/confirmation/${transactionID}/${reportID}/${backToReport ?? ''}${
607+
participantsAutoAssigned ? '?participantsAutoAssigned=true' : ''
608+
}` as const,
610609
},
611610
MONEY_REQUEST_STEP_AMOUNT: {
612611
route: ':action/:iouType/amount/:transactionID/:reportID/:pageIndex?/:backToReport?',

‎src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
import React, {useCallback, useMemo} from 'react';
1+
import React, {useCallback, useMemo, useRef} from 'react';
22
import {View} from 'react-native';
33
import type {PointerEvent} from 'react-native';
44
import type PressableProps from '@components/Pressable/GenericPressable/types';
55
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
6+
import useDragAndDrop from '@hooks/useDragAndDrop';
67
import useLocalize from '@hooks/useLocalize';
78
import useThemeStyles from '@hooks/useThemeStyles';
89
import CONST from '@src/CONST';
10+
import htmlDivElementRef from '@src/types/utils/htmlDivElementRef';
11+
import viewRef from '@src/types/utils/viewRef';
912

1013
type TransparentOverlayProps = {
1114
onPress: () => void;
@@ -16,6 +19,13 @@ type OnPressHandler = PressableProps['onPress'];
1619
function TransparentOverlay({onPress: onPressProp}: TransparentOverlayProps) {
1720
const {translate} = useLocalize();
1821
const styles = useThemeStyles();
22+
const dropZone = useRef<HTMLDivElement | View>(null);
23+
24+
const {isDraggingOver} = useDragAndDrop({
25+
// eslint-disable-next-line react-compiler/react-compiler
26+
dropZone: htmlDivElementRef(dropZone),
27+
onDrop: () => {},
28+
});
1929

2030
const onPress = useCallback<NonNullable<OnPressHandler>>(
2131
(event) => {
@@ -41,7 +51,9 @@ function TransparentOverlay({onPress: onPressProp}: TransparentOverlayProps) {
4151
return (
4252
<View
4353
onPointerDown={handlePointerDown}
44-
style={styles.fullScreen}
54+
style={[styles.fullScreen, isDraggingOver && styles.dNone]}
55+
// eslint-disable-next-line react-compiler/react-compiler
56+
ref={viewRef(dropZone)}
4557
>
4658
<PressableWithoutFeedback
4759
onPress={onPress}

‎src/components/HTMLEngineProvider/HTMLRenderers/RBRRenderer.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
99
function RBRRenderer({tnode, style}: CustomRendererProps<TText | TPhrasing>) {
1010
const styles = useThemeStyles();
1111
const htmlAttribs = tnode.attributes;
12+
const isSmall = htmlAttribs?.issmall !== undefined;
1213
const shouldShowEllipsis = htmlAttribs?.shouldshowellipsis !== undefined;
1314
const flattenStyle = StyleSheet.flatten(style as TextStyle);
1415

@@ -21,7 +22,7 @@ function RBRRenderer({tnode, style}: CustomRendererProps<TText | TPhrasing>) {
2122
numberOfLines={shouldShowEllipsis ? 1 : 0}
2223
ellipsizeMode="tail"
2324
key={props.key}
24-
style={[styles.textLabelError, flattenStyle]}
25+
style={[styles.textLabelError, flattenStyle, isSmall ? styles.textMicro : {}]}
2526
>
2627
{props.childElement}
2728
</Text>

0 commit comments

Comments
 (0)