From d02fb014c7c21e131ed9f93c8952c182429b3e1f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:37:16 -0400
Subject: [PATCH 1/2] Merge pull request #17507 from
 Expensify/version-BUILD-68C0C92E-15AC-469A-81FC-1EEE0E5D2C56

Update version to 1.3.0-1 on main

(cherry picked from commit e0bd054c6b8956b5ed2c77591d21e1223750e01c)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1f6cef81a2e7..5bd5feb9db6a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030000
-        versionName "1.3.0-0"
+        versionCode 1001030001
+        versionName "1.3.0-1"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 8d218b39f973..84aa8cd47d56 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.0.0</string>
+	<string>1.3.0.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index c7d7076eb1b3..3e41767a8d70 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.0.0</string>
+	<string>1.3.0.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 649b88b4ebaf..83151ae5beb2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.0-0",
+  "version": "1.3.0-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.0-0",
+      "version": "1.3.0-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 435e5e657206..dd89d26fe7fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.0-0",
+  "version": "1.3.0-1",
   "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.",

From 90f7581958271006e9aebbc2ed05b46a9f683b3b Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Mon, 17 Apr 2023 10:28:19 -0400
Subject: [PATCH 2/2] Merge pull request #17494 from
 dukenv0307/fix/16800-blank-space-on-the-right-side-of-tooltip

Fix: Regression of console error
(cherry picked from commit 162c649f4b0dee4db15d129152a0a6d45e45ab92)
---
 src/components/Tooltip/TooltipRenderedOnPageBody.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/Tooltip/TooltipRenderedOnPageBody.js b/src/components/Tooltip/TooltipRenderedOnPageBody.js
index 40dabf1b7651..13af49751c57 100644
--- a/src/components/Tooltip/TooltipRenderedOnPageBody.js
+++ b/src/components/Tooltip/TooltipRenderedOnPageBody.js
@@ -86,6 +86,12 @@ class TooltipRenderedOnPageBody extends React.PureComponent {
     }
 
     componentDidUpdate(prevProps) {
+        // We need to re-calculate the tooltipContentWidth if it is greater than maxWidth.
+        // So that the wrapperWidth still be updated again with correct value
+        if (this.state.tooltipContentWidth > prevProps.maxWidth) {
+            this.updateTooltipContentWidth();
+        }
+
         if (prevProps.text === this.props.text && prevProps.renderTooltipContent === this.props.renderTooltipContent) {
             return;
         }