Merge branch 'main' of https://github.com/priyeshshah11/App into priy…

…eshshah11-upgrade-rn-version

.github/PULL_REQUEST_TEMPLATE.md

@@ -108,6 +108,7 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
 - [ ] If a new CSS style is added I verified that:
     - [ ] A similar style doesn't already exist
     - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)`)
+- [ ] If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
 - [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
 - [ ] If a new page is added, I verified it's using the `ScrollView` component to make it scrollable when more elements are added to the page.

Gemfile.lock

@@ -1,21 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.6)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.3)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    apktools (0.7.4)
-      rubyzip (~> 2.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
@@ -77,7 +75,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     declarative (0.0.20)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
@@ -86,7 +84,7 @@ GEM
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     excon (0.93.0)
     faraday (1.10.2)
@@ -157,10 +155,6 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-aws_s3 (2.1.0)
-      apktools (~> 0.7)
-      aws-sdk-s3 (~> 1)
-      mime-types (~> 3.3)
     ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -207,18 +201,15 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
-    json (2.6.2)
+    json (2.6.3)
     jwt (2.5.0)
     memoist (0.16.2)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    minitest (5.16.2)
+    minitest (5.18.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -260,7 +251,7 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
@@ -280,7 +271,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   arm64-darwin-21
@@ -292,8 +283,7 @@ PLATFORMS
 DEPENDENCIES
   cocoapods (~> 1.11.3)
   fastlane (~> 2)
-  fastlane-plugin-aws_s3
   xcpretty (~> 0)
 
 BUNDLED WITH
-   2.3.24
+   2.1.4

__mocks__/@ua/react-native-airship.js

@@ -20,6 +20,10 @@ const Airship = {
         iOS: {
             setBadgeNumber: jest.fn(),
             setForegroundPresentationOptions: jest.fn(),
+            setForegroundPresentationOptionsCallback: jest.fn(),
+        },
+        android: {
+            setForegroundDisplayPredicate: jest.fn(),
         },
         enableUserNotifications: () => Promise.resolve(false),
         clearNotifications: jest.fn(),

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001029604
-        versionName "1.2.96-4"
+        versionCode 1001029802
+        versionName "1.2.98-2"
     }
 
     splits {
@@ -212,6 +212,7 @@ dependencies {
     implementation project(':react-native-plaid-link-sdk')
 
     // Fixes a version conflict between airship and react-native-plaid-link-sdk
+    // This may be fixed by a newer version of the plaid SDK (not working as of 10.0.0)
     implementation "androidx.work:work-runtime-ktx:2.8.0"
 
     // This okhttp3 dependency prevents the app from crashing - See https://github.com/plaid/react-native-plaid-link-sdk/issues/74#issuecomment-648435002

android/app/src/main/res/drawable/picker_background.xml

@@ -2,5 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/card_highlight_bg" />
+    <padding
+        android:bottom="@dimen/picker_item_inset"
+        android:top="@dimen/picker_item_inset" />
     <corners android:radius="@dimen/dialog_radius" />
 </shape>

android/app/src/main/res/values-v31/dimen.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="picker_item_inset">0dip</dimen>
+</resources>

android/app/src/main/res/values-v31/styles.xml

@@ -1,5 +1,13 @@
 <resources>
 
+    <!-- Android 12 lets us clips the ripple at the outline, so we do that rather than inset -->
+    <style name="AppTheme.Popup" parent="Base.ThemeOverlay.AppCompat">
+        <item name="colorBackgroundFloating">@null</item>
+        <item name="android:background">@drawable/picker_background</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:clipToOutline">true</item>
+    </style>
+
     <style name="Theme.SplashScreen" parent="Theme.SplashScreen.Common">
         <item name="android:windowSplashScreenAnimatedIcon">?windowSplashScreenAnimatedIcon</item>
         <item name="android:windowSplashScreenBackground">?windowSplashScreenBackground</item>

android/app/src/main/res/values/dimen.xml

@@ -2,4 +2,6 @@
 <resources>
     <dimen name="dialog_radius">16dp</dimen>
     <dimen name="spinner_font_size">16dp</dimen>
+    <!-- Inset accommodates border radius to prevent ripple overflow -->
+    <dimen name="picker_item_inset">3dip</dimen>
 </resources>

contributingGuides/CONTRIBUTING.md

@@ -111,7 +111,7 @@ Additionally if you want to discuss an idea with the open source community witho
 3. If you cannot reproduce the problem, pause on this step and add a comment to the issue explaining where you are stuck or that you don't think the issue can be reproduced.
 
 #### Propose a solution for the job
-4. Do not propose solutions to jobs until the `Help Wanted` label has been applied. Any proposals submitted before these labels are added will not be reviewed. 
+4. Do not propose solutions to jobs without the `Help Wanted` label applied. Any proposals submitted when that label is not present will not be reviewed.
 5. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. ALL NEW PROPOSALS MUST BE DIFFERENT FROM EXISTING PROPOSALS. The *difference* should be important, meaningful or considerable.
 6. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).

contributingGuides/REVIEWER_CHECKLIST.md

@@ -46,6 +46,7 @@
 - [ ] If a new CSS style is added I verified that:
     - [ ] A similar style doesn't already exist
     - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
+- [ ] If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
 - [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
 - [ ] If a new page is added, I verified it's using the `ScrollView` component to make it scrollable when more elements are added to the page.

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.96</string>
+	<string>1.2.98</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.96.4</string>
+	<string>1.2.98.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.96</string>
+	<string>1.2.98</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.96.4</string>
+	<string>1.2.98.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.96-4",
+  "version": "1.2.98-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/ROUTES.js

@@ -42,7 +42,6 @@ export default {
     SETTINGS_ADD_DEBIT_CARD: 'settings/payments/add-debit-card',
     SETTINGS_ADD_BANK_ACCOUNT: 'settings/payments/add-bank-account',
     SETTINGS_ENABLE_PAYMENTS: 'settings/payments/enable-payments',
-    SETTINGS_ADD_LOGIN: 'settings/addlogin/:type',
     getSettingsAddLoginRoute: type => `settings/addlogin/${type}`,
     SETTINGS_PAYMENTS_TRANSFER_BALANCE: 'settings/payments/transfer-balance',
     SETTINGS_PAYMENTS_CHOOSE_TRANSFER_ACCOUNT: 'settings/payments/choose-transfer-account',
@@ -53,6 +52,7 @@ export default {
     SETTINGS_CONTACT_METHODS,
     SETTINGS_CONTACT_METHOD_DETAILS: `${SETTINGS_CONTACT_METHODS}/:contactMethod/details`,
     getEditContactMethodRoute: contactMethod => `${SETTINGS_CONTACT_METHODS}/${encodeURIComponent(contactMethod)}/details`,
+    SETTINGS_NEW_CONTACT_METHOD: `${SETTINGS_CONTACT_METHODS}/new`,
     NEW_GROUP: 'new/group',
     NEW_CHAT: 'new/chat',
     REPORT,

src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js

@@ -75,6 +75,10 @@ const BaseAnchorForCommentsOnly = (props) => {
                         target: props.target,
                     }}
                     href={linkProps.href}
+
+                    // Add testID so it gets selected as an anchor tag by SelectionScraper
+                    testID="a"
+
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...rest}
                 >

src/components/AvatarWithImagePicker.js

@@ -258,20 +258,22 @@ class AvatarWithImagePicker extends React.Component {
                     onPress={() => this.setState({isMenuVisible: true})}
                 >
                     <View style={[styles.pRelative, styles.avatarLarge]}>
-                        {this.props.source
-                            ? (
-                                <Avatar
-                                    containerStyles={styles.avatarLarge}
-                                    imageStyles={[styles.avatarLarge, styles.alignSelfCenter]}
-                                    source={this.props.source}
-                                    fallbackIcon={this.props.fallbackIcon}
-                                    size={this.props.size}
-                                    type={this.props.type}
-                                />
-                            )
-                            : (
-                                <DefaultAvatar />
-                            )}
+                        <Tooltip text={this.props.translate('avatarWithImagePicker.editImage')}>
+                            {this.props.source
+                                ? (
+                                    <Avatar
+                                        containerStyles={styles.avatarLarge}
+                                        imageStyles={[styles.avatarLarge, styles.alignSelfCenter]}
+                                        source={this.props.source}
+                                        fallbackIcon={this.props.fallbackIcon}
+                                        size={this.props.size}
+                                        type={this.props.type}
+                                    />
+                                )
+                                : (
+                                    <DefaultAvatar />
+                                )}
+                        </Tooltip>
                         <AttachmentPicker type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}>
                             {({openPicker}) => (
                                 <>

src/components/Button.js

@@ -241,13 +241,13 @@ class Button extends Component {
                     }
 
                     if (this.props.shouldEnableHapticFeedback) {
-                        HapticFeedback.trigger();
+                        HapticFeedback.press();
                     }
                     this.props.onPress(e);
                 }}
                 onLongPress={(e) => {
                     if (this.props.shouldEnableHapticFeedback) {
-                        HapticFeedback.trigger();
+                        HapticFeedback.longPress();
                     }
                     this.props.onLongPress(e);
                 }}

src/components/CommunicationsLink.js

@@ -38,7 +38,7 @@ const CommunicationsLink = props => (
                 {props.children}
             </View>
             <ContextMenuItem
-                icon={Expensicons.Clipboard}
+                icon={Expensicons.Copy}
                 text={props.translate('reportActionContextMenu.copyToClipboard')}
                 successIcon={Expensicons.Checkmark}
                 successText={props.translate('reportActionContextMenu.copied')}

src/components/CopyTextToClipboard.js

@@ -61,7 +61,7 @@ class CopyTextToClipboard extends React.Component {
                 <Text style={this.props.textStyles}>{this.props.text}</Text>
                 <Tooltip text={this.props.translate(`reportActionContextMenu.${this.state.showCheckmark ? 'copied' : 'copyToClipboard'}`)}>
                     <Icon
-                        src={this.state.showCheckmark ? Expensicons.Checkmark : Expensicons.Clipboard}
+                        src={this.state.showCheckmark ? Expensicons.Checkmark : Expensicons.Copy}
                         fill={this.state.showCheckmark ? themeColors.iconSuccessFill : themeColors.icon}
                         width={variables.iconSizeSmall}
                         height={variables.iconSizeSmall}