Merge branch 'main' of github.com:Expensify/App into francois-fixTask…

…NewPhoneNumber

.eslintrc.js

@@ -2,7 +2,7 @@ module.exports = {
     extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'prettier', 'plugin:react-native-a11y/basic'],
     plugins: ['react-hooks', 'react-native-a11y'],
     parser: 'babel-eslint',
-    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', '.git/**'],
+    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
     env: {
         jest: true,
     },

package.json

@@ -182,7 +182,7 @@
     "css-loader": "^6.7.2",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "22.3.14",
+    "electron": "^25.2.0",
     "electron-builder": "24.5.0",
     "eslint": "^7.6.0",
     "eslint-config-expensify": "^2.0.38",

src/CONST.js

@@ -1141,7 +1141,7 @@ const CONST = {
         CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
         CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
         PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]{1,20}$/,
-        ROOM_NAME: /^#[a-z0-9-]{1,80}$/,
+        ROOM_NAME: /^#[a-z0-9à-ÿ-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,

src/components/Pressable/GenericPressable/index.js

@@ -14,6 +14,7 @@ const WebGenericPressable = forwardRef((props, ref) => (
         aria-label={props.accessibilityLabel}
         aria-labelledby={props.accessibilityLabelledBy}
         aria-valuenow={props.accessibilityValue}
+        nativeID={props.nativeID || 'no-drag-area'}
     />
 ));
 

src/components/ReportActionItem/ReportPreview.js

@@ -23,6 +23,7 @@ import * as IOU from '../../libs/actions/IOU';
 import refPropTypes from '../refPropTypes';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
 import themeColors from '../../styles/themes/default';
+import reportPropTypes from '../../pages/reportPropTypes';
 
 const propTypes = {
     /** All the data of the action */
@@ -37,10 +38,7 @@ const propTypes = {
 
     /* Onyx Props */
     /** chatReport associated with iouReport */
-    chatReport: PropTypes.shape({
-        /** Whether the chat report has an outstanding IOU */
-        hasOutstandingIOU: PropTypes.bool.isRequired,
-    }),
+    chatReport: reportPropTypes,
 
     /** Active IOU Report for current report */
     iouReport: PropTypes.shape({

src/components/SettlementButton.js

@@ -94,7 +94,7 @@ class SettlementButton extends React.Component {
                 value: CONST.IOU.PAYMENT_TYPE.PAYPAL_ME,
             },
             [CONST.IOU.PAYMENT_TYPE.ELSEWHERE]: {
-                text: isExpenseReport ? this.props.translate('iou.payExpenseElsewhere') : this.props.translate('iou.settleElsewhere'),
+                text: this.props.translate('iou.payElsewhere'),
                 icon: Expensicons.Cash,
                 value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
             },
@@ -127,7 +127,7 @@ class SettlementButton extends React.Component {
             return [
                 {
                     ...paymentMethods[paymentMethod],
-                    text: paymentMethod === CONST.IOU.PAYMENT_TYPE.ELSEWHERE ? this.props.translate('iou.payExpenseElsewhere') : this.props.translate('iou.pay'),
+                    text: paymentMethod === CONST.IOU.PAYMENT_TYPE.ELSEWHERE ? this.props.translate('iou.payElsewhere') : this.props.translate('iou.pay'),
                 },
             ];
         }

src/languages/en.js

@@ -353,8 +353,7 @@ export default {
         settledElsewhere: 'Paid elsewhere',
         settledPaypalMe: 'Paid using Paypal.me',
         settleExpensify: 'Pay with Expensify',
-        settleElsewhere: "I'll settle up elsewhere",
-        payExpenseElsewhere: 'Pay elsewhere',
+        payElsewhere: 'Pay elsewhere',
         settlePaypalMe: 'Pay with PayPal.me',
         requestAmount: ({amount}) => `request ${amount}`,
         splitAmount: ({amount}) => `split ${amount}`,

src/languages/es.js

@@ -352,8 +352,7 @@ export default {
         settledElsewhere: 'Pagado de otra forma',
         settledPaypalMe: 'Pagado con PayPal.me',
         settleExpensify: 'Pagar con Expensify',
-        settleElsewhere: 'Voy a pagar de otra forma',
-        payExpenseElsewhere: 'Pagar de otra forma',
+        payElsewhere: 'Pagar de otra forma',
         settlePaypalMe: 'Pagar con PayPal.me',
         requestAmount: ({amount}) => `solicitar ${amount}`,
         splitAmount: ({amount}) => `dividir ${amount}`,

src/styles/styles.js

@@ -25,10 +25,6 @@ import cursor from './utilities/cursor';
 import userSelect from './utilities/userSelect';
 import textUnderline from './utilities/textUnderline';
 
-function getTransparentColor(color, transparency = '') {
-    return `${color}${transparency}`;
-}
-
 const picker = {
     backgroundColor: themeColors.transparent,
     color: themeColors.text,
@@ -3388,7 +3384,7 @@ const styles = {
     linkPreviewWrapper: {
         marginTop: 16,
         borderLeftWidth: 4,
-        borderLeftColor: getTransparentColor(themeColors.inverse, 33),
+        borderLeftColor: themeColors.border,
         paddingLeft: 12,
     },
 

tests/unit/ValidationUtilsTest.js

@@ -47,6 +47,10 @@ describe('ValidationUtils', () => {
         test('room name with lowercase letters, numbers, and dashes', () => {
             expect(ValidationUtils.isValidRoomName('#this-is-a-room1')).toBe(true);
         });
+
+        test('room name with spanish Accented letters and dashes', () => {
+            expect(ValidationUtils.isValidRoomName('#sala-de-opinión')).toBe(true);
+        });
     });
 
     describe('isValidWebsite', () => {