From 0b007889e40c01d0f5d8d0cd551a845ab9cf1739 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 28 Jun 2023 13:49:36 +0300
Subject: [PATCH 01/69] Update util function to use new reportAction prop

---
 src/libs/actions/Task.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index 5e27d7db764d..fce7a800c32a 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -647,8 +647,7 @@ function getTaskAssigneeAccountID(taskReport) {
     }
 
     const reportAction = ReportActionsUtils.getParentReportAction(taskReport);
-    const childManagerEmail = lodashGet(reportAction, 'childManagerEmail', '');
-    return PersonalDetailsUtils.getAccountIDsByLogins([childManagerEmail])[0];
+    return lodashGet(reportAction, 'childManagerAccountID');
 }
 
 /**

From 36d25362962182d63046932f9448a95395f9dd83 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 28 Jun 2023 13:50:09 +0300
Subject: [PATCH 02/69] Get assignee login from assignee accountID

---
 src/components/ReportActionItem/TaskPreview.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index 576de1991b9c..c50afaf7c134 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -2,6 +2,7 @@ import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import compose from '../../libs/compose';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -18,8 +19,12 @@ import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes
 import * as TaskUtils from '../../libs/actions/Task';
 import RenderHTML from '../RenderHTML';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
+import personalDetailsPropType from '../../pages/personalDetailsPropType';
 
 const propTypes = {
+    /** All personal details asssociated with user */
+    allPersonalDetails: personalDetailsPropType,
+
     /** The ID of the associated taskReport */
     taskReportID: PropTypes.string.isRequired,
 
@@ -58,7 +63,8 @@ function TaskPreview(props) {
         ? props.taskReport.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.taskReport.statusNum === CONST.REPORT.STATUS.APPROVED
         : props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED;
     const taskTitle = props.taskReport.reportName || props.action.childReportName;
-    const taskAssignee = props.taskReport.managerEmail || props.action.childManagerEmail;
+    const taskAssigneeAccountID = TaskUtils.getTaskAssigneeAccountID(props.taskReport);
+    const taskAssignee = lodashGet(allPersonalDetails, [taskAssigneeAccountID, 'login'], '');
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
 
     return (
@@ -102,5 +108,8 @@ export default compose(
         taskReport: {
             key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
         },
+        allPersonalDetails: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
     }),
 )(TaskPreview);

From a7381f41d731e569b2501f02874dad6d79ecd48b Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 28 Jun 2023 13:50:28 +0300
Subject: [PATCH 03/69] Refactor prop types

---
 src/pages/workspace/WorkspaceMembersPage.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index 5b56a801db1c..8f05780e896b 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -32,7 +32,7 @@ import * as UserUtils from '../../libs/UserUtils';
 import FormHelpMessage from '../../components/FormHelpMessage';
 import TextInput from '../../components/TextInput';
 import KeyboardDismissingFlatList from '../../components/KeyboardDismissingFlatList';
-import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../components/withCurrentUserPersonalDetails';
 import * as PolicyUtils from '../../libs/PolicyUtils';
 import PressableWithFeedback from '../../components/Pressable/PressableWithFeedback';
 import usePrevious from '../../hooks/usePrevious';
@@ -40,7 +40,7 @@ import Log from '../../libs/Log';
 import * as PersonalDetailsUtils from '../../libs/PersonalDetailsUtils';
 
 const propTypes = {
-    /** The personal details of the person who is logged in */
+    /** All personal details asssociated with user */
     personalDetails: personalDetailsPropType,
 
     /** URL Route params */
@@ -61,6 +61,7 @@ const propTypes = {
     ...policyPropTypes,
     ...withLocalizePropTypes,
     ...windowDimensionsPropTypes,
+    ...withCurrentUserPersonalDetailsPropTypes,
     network: networkPropTypes.isRequired,
 };
 
@@ -70,6 +71,7 @@ const defaultProps = {
         accountID: 0,
     },
     ...policyDefaultProps,
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 function WorkspaceMembersPage(props) {

From d9a4620f36856a954eb1f79c876c9d3d11e8aa8f Mon Sep 17 00:00:00 2001
From: Eric Han <hanyl_fight@126.com>
Date: Thu, 29 Jun 2023 17:11:45 +0800
Subject: [PATCH 04/69] fix icon not set when adding bookmark to iOS home
 screen

---
 config/webpack/webpack.common.js |   1 +
 web/apple-touch-icon.png         | Bin 0 -> 3842 bytes
 web/index.html                   |   1 +
 3 files changed, 2 insertions(+)
 create mode 100644 web/apple-touch-icon.png

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
index 28bdc48a9ed4..18d730db26a7 100644
--- a/config/webpack/webpack.common.js
+++ b/config/webpack/webpack.common.js
@@ -82,6 +82,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 {from: 'web/favicon.png'},
                 {from: 'web/favicon-unread.png'},
                 {from: 'web/og-preview-image.png'},
+                {from: 'web/apple-touch-icon.png'},
                 {from: 'assets/css', to: 'css'},
                 {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
diff --git a/web/apple-touch-icon.png b/web/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..625b519e2cfade153c4512a6ad159b4c8cfebe58
GIT binary patch
literal 3842
zcmb7HS2!C0*A5c1YR8IErL~oq(I7_c-4etejlD|DB6ihmX^pC?R;{46P-^dn)~r!Q
zY*ngal+X8H{}=y%anAdk_uRbCxj5&%$tFhH^t4>G004kqS4Y$A3hVzH)Rb2lK1wNb
z1vGv-R)GKj9m{`%43JmAaYd2^nrW*8aAT0os{;5CVTb?#YSZb?9YFxV^%uIDi2EUA
zyRYD0_btKwzj&lrp&|gzq@F}wv*?==AU7d&fq+QSlX~42LPA)R(4<ehX=}}br1wCM
zNlA=XO#Mrz)EajZwI;0th;}DC=_P)>Aa}hXRh4*mDIN3c?6M@2$7O&tdie^ocT(?+
zk%UpG-FS2j03t)g7DpE$Ow|ZQ!u)6xRz_K2T52v<5Rm=}IhIoE|Ij9-k}dkDRHs^<
z9$iN5pHKeq#FR?6zv}*l;joEhXd^>Rs{zk8Kr}()iWjH$%)c~FTmQ@{o<iBgciMkt
z5HK8pAqtU8P&cQhHvSMe;~(l~ys=j2UjK_e!m-D=52aN=i^xm-myz-`SMV7V^YQ9q
z=iA4K)tdlBbu97+_i<`|s8a!Q(cX|5xg&Uxt=`192Myl(p|&a>TtiD8mXt)AgRc+^
zuWNoYA+<|%s0J9%1bm0~U+aN)Hik;}i|WriFr@>N@rSd%g8{#|Nvjg?vaz^I|I4ii
z7)F3U_!J)2ZoD`6_^Z6N5L#tkDOk)0F72&$?hTf2pHmkDN~mA>$VW95OKM<B=({AX
z32Dq+d$cqseH0W4;IkBSt+N>|+SW&Wq4=cqQ7~T3k)6HK`M5Z0^S#UO&eMIC;ZZo0
z=lbz0xQAXb2c3jP?)mD)WcV%E%5xl1(GOEvf|IyZ=-%AfgXO~YGV`_c^2EijcYNad
z7JfI(y}0}0s5d>Oc1nvHR{o%HMr-gXCiPvlxRbI<W%qtu$>-VQj<bSKm%T4rsHv=4
zH&+SB=!P*n!rp-avSMDSw(zbCte~c-TBTQ6l=)rD5lah=DpkYJzayq!l~i2=ZrSiz
z3vjq($Hx6^7Dk^^Fz?6Q6TD4=i+3>K_VGs{ek@X?NCE$+pO(0h+o-__^~1N#m(zUb
zcn+8NwQ=Rz+sQ&x0y+5%A<sV@Q?~Fq+ehW~{_5bJwL)L)pDxYIE;@J`;Ns#w%ILF6
z+4!{5oS~it{JZ#DCC`UEiJlv-n-LL11ZI^OOG(vaeBpgYcz~Ni=a%0|whQQvQpQU-
zDl<38g=VD|MLx+j?-Yn`hnsVq<5Lay_>en!)5F1s-U0*agf!ICPYkNH2bucS>J{Sh
z$#|)<sNRMOr>)$H5JWf=6wm&eN8wf1M<<)Eu1|hL%}YFY{&g(z4$?2b{*rr-ZZ75J
zplG_SqHRgIv}o`ap_AUxv)y#0&^PP}V*TQehu6$l;uo(kh7DgteL?Xst(k&&6ol2s
z|G75KoJ=9|CaB$8I-P;H!Fy*0t(+RDG(UN=n;h!Y#Cf*zsKWNC{8wRwKIQ&_w>dja
ze`bDWB#QIfduc3j?wany={UNnKpX<_7(G(cxBJaaZKSA}32ZH6J*g-z#26S+z888j
zLaJ0x+<#yHNQk|jb$!}!Tz$lJ8OMJ-nK~(i?=BU!{HN<8;{Pzz?1jcTQU6GEou5c*
z6C%p_v6YOF8|YXg>RfTl3WwqfNlKC^1{po5)@x0BAuqEG142N|*2r*?V&M8Y4aHBH
zgL;uMO}l)BGM!r+){mh)DuV9h#Vf3d!JK>M-V#X$SsISEmd-oIjxy2nZ(kfpZ^kbg
zIUDoJ8phBK@4R^Zaz>NA9s=}4K2!k?l_vmnf@O|B%RYLW4q~l;=UF|A>WuYL#IoTF
zZ?z7aR-`x~UotRviAg{Img?Z0_yL<UPB9njfaxzP<P>~&IDQuE1E#+laN|I*q8W=@
z^MGitp;&%w>dCcQ^|U_?QAxhiIF-AdXIiwx;o^n;dx#9<k$cK+OpvQQL}JZlW*|z#
z!uT%dRvuHJZ9h!k5P(W0erB=oM7mdheI<V*t>{Xqrd(c1bIcG$u|d!iH3&jXyQ>SP
z08!z8jDspZK*3}`gCx?qTqnq<T27M2$E`PQRC5VEO!ef*^@tk2O^?@FbTJws2#`b~
zV(r}Rie$96X8HYt(e6jLBNE}sjtU54n^NN2(!ATuD9-N)s%qm_9@6H}G1i_95F*1y
z`)JpAD3>m5^`z$H`oh+Xxa^!W<Lru=n%j<23M=z;ETV|Dr}sFr{np;jnb^`e<I{FL
z)=AQmHj@#HJ5MN?AKiJOv8{TjN1buo+ERLT?8py0)#e_oa0e-EPxAXv_JVjnq)1So
z5iy*<wg$aPF3leO(WVbH*Tiv;FeIWgc-^d%o5xPC+)?r-U6l%>(I-zeqThvDrUvzz
zc4-r#4a&XZo6>0{iqf7<+~|;=?I_Cjz2De~6{z9c;&OMDNO;&rXRZ9*Ae>1p(9{au
zJ=i3)!hMOI;-zL-$Fne0#zdkGYbS1A#`65bL*}yEIHf{?+cizf2kCCh0UscdDva1-
zlUK<(=j<XU)oUh#_YL}#-%WS_bME`DazKAWwPF0bo!nXnSutc0RFxYw6~{(tcOzvb
zhn(R7r!jOg@V+>Wbpt8u=w~gZO4V?T)5QUS$O>jN{=>8{wjs2ZFE+9U=xN?7+s?@o
zM|<BUmx=3jY%tFTpP!EFVk&3+n<1T2cA(v}-()g^zgq_ChOdrcy<m_MU_aF!am?5N
zaQ`iePPqfoiAdAK>jvLA95w&p&0O7oxD&vSn-8wflw5ja(}A68g|z&l1p3w?^M>Cf
zYY;!Rv$ds8r2erjB6dX7SNJJ|^K6yg_ZH@Rd<*-@s<>-D9VpO;FFHx%4oXU*BVeDg
z!Zc<YEg3yjz5-08|0^m_!!bHd=xUM$))b>|fK5LJZNA^G;hab`-uQT6_e=cJQ{Yd2
z$&w-UGvAEAQXAbvpQRbPukBLMnD8EWgC!Hg<YO-_f-@+0+hEFj9i_55TQ*R7T>$|_
z2sp-r2<2|S$=M9S_9^^ap01ggeY;r3g1)8CK?g5`%&|Lm3sW0t1aHML)gPGtbnDu~
zQ7oJO`j&eQS^|AK{AQu$b1k~(ZQZ>fewWBqmp7m_?(6L`>~R|4%3EWM7QpZ3!owVF
zs#5Gi$MB_(-|w0gqj!57Hglxh7g960W4mecq$K-Gw1b2;){)nge0u^c_cF%zUJ4Q#
zc+XDFS-8`DHvX;qz4j-7#l1z|#eUD^8`?-%u6xk=q^Aa3XhxgYjnVn&5+5Alr-RYB
zh-6{(=aZ!Zz>t5cN4Ybo4m2O!D^+jhHrU7cR-gtpaEr0oW5BAQ#<m(2KMGAh1ZIqP
zl1=Qh-a~}M_T7JlG=`)W2(zZ;`!2_K-05LQeIZhMK(V1B&T!&~J*iGTg*@0)%VB5%
zL<55O`l?J4DIg}nhAQ&^_HoR7Xzj0DvOMjGM_n|^BJ8A*Y_zNPWy2?E;+BBn<dfSQ
zFpE4HlX0^_2YpiVY)APc&>#%+zPqo`k~s+Zw#u|(yyFoIRZjx{lvPWkQDtC{m5@Kk
zwp;ITr7CJom9iwB0lU{nF}alN{VI23<<U0M9ka`eO7HnLn<18&I`FIn`{28G9MZkj
zvmsswwa!#2d_JFizK|FFoyBD_p^+^1CU<5Pl*N`{aJAkK6ZEgMX)RB@*NTz?&i#ql
z{va*T6!>_kgntwmHN@LTTOUiRaW#^Qmz&k29pf#(o@DDqr4wJinahBsQBKd=LvErJ
z;Q`B8uT0W7C@xH7;iZbyxYNu0=L9L0^6l}#_N6<4JtQw_tEobzoK^njtko2S-lLh~
zN`jqYcEp;`_Htpbl<Mq$pu-IeInSKjOsz7z-01A*ABv?b^;<&*tZ?Ft%=)~djX;)5
zD9KFT?zfL#_<@?U%G*BbRwt#HkH<Wf7=TAs&l?4bDGo0x@oK97`CZWk!(`+u33y<I
zPf_wh-zOH_bwPP8nz@CryTbmJ!E3ubtOF%!sq*CD1BPRvtoq<|!9>Fr+KFR}X;xXu
zAycX*(p+=3kJsIaY!*fP0*~F8ukdi!`6VA8m4lq>@!s@0_8=zg-sRd^CXwZZOY%Kz
z)d8k1wz13<X2?t*@kjTsWFqiH8`3zsmy{pw1}i9rS3s&VSbP}2{Cf7lVp94Lhz$51
zAXz$UPZ%=AO-uxZ_Pz8xj1_m$y*M%%*n3^K#pXGD2~;psBW!+v<74Ch(OccoYk4T;
z#h@+;irclI&es<VJg8l$nC|mi#V+8q3*`@j53et~N}<zGAt!fcqarTU&b<nIZ-ete
zi?aTfQzZL8c9;K<a0>^qW`gj;kL<F1`-`ZkA{*;E(D@9GcVYOaiacwRoWFl;O-XL3
z)BJfIzW^>Hj5wl^@7nXGdWr8^2@U;ij~S1{#K%c8UJpF8q%s*)X$DtK0|rLna>Rai
z({m?qAj?*6lRgs`tONADIB%Dx^FQXXwxbwz#TBR%)6&W-Vyi+iiM5`6bV&_W;^KVh
z&3~}RU(UlwPJRQnPZZ7GG{t5al|GYeIDHR6Fl63~;nFajOG3K(cyDKajYbs|fjIf(
zQ>v`F5jeAThTBiXLBde4{vaB5BTj9q){CaP@r8^&^_-cD3zCDO&YS1%Z>BqQS|_{Q
zZq$V%s<Y-(j?nQ%V%E2Jz%(tz53o2!NAnNH?I1b!W}CudaPVpD6m?7Sl@s_;miKWu
zo(kcn8u>g<x#e}`?{NzSt|n`O7*oY)cKGv5XbXzTXanL|Eoa9-9VX#YwlM$2?4C$2
z>~B;4qj*vMyFq>?L>i`Qa_k~G=ikxZgB{<)V`<PBxLKL?4uk%xmmo36ixyZFFF|^1
zuQ@LeVB~69=6Nqr&T=Zc#!o5!aY*{6!4B8^ug4By&zY&`ZdUYB_#G{|Q5k|or$hI>
z6mf`z?H?dkQn+TNh`5K@9VMFokAM4L+@F>aj~JSb!sbAg4bX4e7xCEh%CZ7<wTv`z
I>JHfd04`TA;s5{u

literal 0
HcmV?d00001

diff --git a/web/index.html b/web/index.html
index 90011c87e7a9..d207fa54b97a 100644
--- a/web/index.html
+++ b/web/index.html
@@ -120,6 +120,7 @@
         }
     </style>
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, interactive-widget=resizes-content">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
     <link rel="shortcut icon" id="favicon" href="/favicon.png">
     <% if (htmlWebpackPlugin.options.usePolyfillIO) { %>
         <!-- polyfill.io is only needed on Web to support older browsers. It should not be loaded for desktop -->

From 778891a8bbd118ca472e90d777f7df9a3ceaa4b1 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 29 Jun 2023 13:14:46 +0300
Subject: [PATCH 05/69] A bit of lint cleanup

---
 src/components/ReportActionItem/TaskPreview.js | 2 +-
 src/libs/actions/Task.js                       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index c50afaf7c134..f91f6d5f1536 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -64,7 +64,7 @@ function TaskPreview(props) {
         : props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED;
     const taskTitle = props.taskReport.reportName || props.action.childReportName;
     const taskAssigneeAccountID = TaskUtils.getTaskAssigneeAccountID(props.taskReport);
-    const taskAssignee = lodashGet(allPersonalDetails, [taskAssigneeAccountID, 'login'], '');
+    const taskAssignee = lodashGet(props.allPersonalDetails, [taskAssigneeAccountID, 'login'], '');
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
 
     return (
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index fce7a800c32a..4754cde1a2c1 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -10,7 +10,6 @@ import ROUTES from '../../ROUTES';
 import CONST from '../../CONST';
 import DateUtils from '../DateUtils';
 import * as UserUtils from '../UserUtils';
-import * as PersonalDetailsUtils from '../PersonalDetailsUtils';
 import * as ReportActionsUtils from '../ReportActionsUtils';
 
 /**

From c8f63aa1bfd3a4f42ec713972857fd8b405bacb6 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 29 Jun 2023 13:53:34 +0300
Subject: [PATCH 06/69] Rename prop & add default

---
 src/components/ReportActionItem/TaskPreview.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index f91f6d5f1536..99ef4c276468 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -23,7 +23,7 @@ import personalDetailsPropType from '../../pages/personalDetailsPropType';
 
 const propTypes = {
     /** All personal details asssociated with user */
-    allPersonalDetails: personalDetailsPropType,
+    personalDetailsList: personalDetailsPropType,
 
     /** The ID of the associated taskReport */
     taskReportID: PropTypes.string.isRequired,
@@ -51,6 +51,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+    personalDetailsList: {},
     taskReport: {},
     isHovered: false,
 };
@@ -64,7 +65,7 @@ function TaskPreview(props) {
         : props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED;
     const taskTitle = props.taskReport.reportName || props.action.childReportName;
     const taskAssigneeAccountID = TaskUtils.getTaskAssigneeAccountID(props.taskReport);
-    const taskAssignee = lodashGet(props.allPersonalDetails, [taskAssigneeAccountID, 'login'], '');
+    const taskAssignee = lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'login'], '');
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
 
     return (
@@ -108,7 +109,7 @@ export default compose(
         taskReport: {
             key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
         },
-        allPersonalDetails: {
+        personalDetailsList: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
     }),

From c273a110b94f264761fa4cf8ffe0e7698e580b2f Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 30 Jun 2023 18:43:57 +0800
Subject: [PATCH 07/69] move chat message style to outer view

---
 .../ReportActionItem/TaskPreview.js           | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index 4f29f6d39984..f3c358b7958a 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -62,34 +62,36 @@ function TaskPreview(props) {
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
 
     return (
-        <PressableWithoutFeedback
-            onPress={() => Navigation.navigate(ROUTES.getReportRoute(props.taskReportID))}
-            style={[styles.flexRow, styles.justifyContentBetween, styles.chatItemMessage]}
-            accessibilityRole="button"
-            accessibilityLabel={props.translate('newTaskPage.task')}
-        >
-            <View style={[styles.flex1, styles.flexRow, styles.alignItemsStart]}>
-                <Checkbox
-                    style={[styles.mr2]}
-                    containerStyle={[styles.taskCheckbox]}
-                    isChecked={isTaskCompleted}
-                    disabled={TaskUtils.isTaskCanceled(props.taskReport)}
-                    onPress={() => {
-                        if (isTaskCompleted) {
-                            TaskUtils.reopenTask(props.taskReportID, taskTitle);
-                        } else {
-                            TaskUtils.completeTask(props.taskReportID, taskTitle);
-                        }
-                    }}
-                    accessibilityLabel={props.translate('newTaskPage.task')}
+        <View style={[styles.chatItemMessage]}>
+            <PressableWithoutFeedback
+                onPress={() => Navigation.navigate(ROUTES.getReportRoute(props.taskReportID))}
+                style={[styles.flexRow, styles.justifyContentBetween]}
+                accessibilityRole="button"
+                accessibilityLabel={props.translate('newTaskPage.task')}
+            >
+                <View style={[styles.flex1, styles.flexRow, styles.alignItemsStart]}>
+                    <Checkbox
+                        style={[styles.mr2]}
+                        containerStyle={[styles.taskCheckbox]}
+                        isChecked={isTaskCompleted}
+                        disabled={TaskUtils.isTaskCanceled(props.taskReport)}
+                        onPress={() => {
+                            if (isTaskCompleted) {
+                                TaskUtils.reopenTask(props.taskReportID, taskTitle);
+                            } else {
+                                TaskUtils.completeTask(props.taskReportID, taskTitle);
+                            }
+                        }}
+                        accessibilityLabel={props.translate('newTaskPage.task')}
+                    />
+                    <RenderHTML html={htmlForTaskPreview} />
+                </View>
+                <Icon
+                    src={Expensicons.ArrowRight}
+                    fill={StyleUtils.getIconFillColor(getButtonState(props.isHovered))}
                 />
-                <RenderHTML html={htmlForTaskPreview} />
-            </View>
-            <Icon
-                src={Expensicons.ArrowRight}
-                fill={StyleUtils.getIconFillColor(getButtonState(props.isHovered))}
-            />
-        </PressableWithoutFeedback>
+            </PressableWithoutFeedback>
+        </View>
     );
 }
 

From 2adcdcb2c5c8751dc55cd3e34a8246a93b377fb6 Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Mon, 3 Jul 2023 18:26:43 +0700
Subject: [PATCH 08/69] Get first error object to show in validate code form

---
 src/libs/ErrorUtils.js                        | 23 ++++++++++++++++++-
 .../ValidateCodeForm/BaseValidateCodeForm.js  |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/libs/ErrorUtils.js b/src/libs/ErrorUtils.js
index fdeae7809f58..d358105477a2 100644
--- a/src/libs/ErrorUtils.js
+++ b/src/libs/ErrorUtils.js
@@ -88,6 +88,27 @@ function getLatestErrorField(onyxData, fieldName) {
         .value();
 }
 
+/**
+ * Get the first error in the errorFields ordering by its key
+ *
+ * @param {Object} onyxData
+ * @param {String} fieldName
+ * @returns {Object}
+ */
+function getFirstErrorField(onyxData, fieldName) {
+    const errorsForField = lodashGet(onyxData, ['errorFields', fieldName], {});
+
+    if (_.isEmpty(errorsForField)) {
+        return {};
+    }
+    return _.chain(errorsForField)
+        .keys()
+        .sortBy()
+        .map((key) => ({[key]: errorsForField[key]}))
+        .first()
+        .value();
+}
+
 /**
  * Method used to generate error message for given inputID
  * @param {Object} errors - An object containing current errors in the form
@@ -112,4 +133,4 @@ function addErrorMessage(errors, inputID, message) {
     }
 }
 
-export {getAuthenticateErrorMessage, getMicroSecondOnyxError, getLatestErrorMessage, getLatestErrorField, addErrorMessage};
+export {getAuthenticateErrorMessage, getMicroSecondOnyxError, getLatestErrorMessage, getLatestErrorField, getFirstErrorField, addErrorMessage};
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 5b1aa87cea80..57a195b53db8 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -165,7 +165,7 @@ function BaseValidateCodeForm(props) {
             </OfflineWithFeedback>
             <OfflineWithFeedback
                 pendingAction={lodashGet(loginData, 'pendingFields.validateLogin', null)}
-                errors={ErrorUtils.getLatestErrorField(loginData, 'validateLogin')}
+                errors={ErrorUtils.getFirstErrorField(loginData, 'validateLogin')}
                 errorRowStyles={[styles.mt2]}
                 onClose={() => User.clearContactMethodErrors(props.contactMethod, 'validateLogin')}
             >

From 1a376a129efd3288270128193c0848560c66bd3a Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Mon, 3 Jul 2023 20:49:46 +0700
Subject: [PATCH 09/69] Update Who Paid section when can modify participants

---
 src/components/MoneyRequestConfirmationList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 7b4f31e57d25..30b39f357dbf 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -132,6 +132,7 @@ function MoneyRequestConfirmationList(props) {
 
     const selectedParticipants = useMemo(() => _.filter(props.participants, (participant) => participant.selected), [props.participants]);
     const payeePersonalDetails = useMemo(() => props.payeePersonalDetails || props.currentUserPersonalDetails, [props.payeePersonalDetails, props.currentUserPersonalDetails]);
+    const canModifyParticipants = !props.isReadOnly && props.canModifyParticipants && props.hasMultipleParticipants;
 
     const optionSelectorSections = useMemo(() => {
         const sections = [];
@@ -152,6 +153,7 @@ function MoneyRequestConfirmationList(props) {
                     data: [formattedPayeeOption],
                     shouldShow: true,
                     indexOffset: 0,
+                    isDisabled: canModifyParticipants,
                 },
                 {
                     title: translate('moneyRequestConfirmationList.whoWasThere'),
@@ -228,7 +230,6 @@ function MoneyRequestConfirmationList(props) {
         [selectedParticipants, onSendMoney, onConfirm, props.iouType],
     );
 
-    const canModifyParticipants = !props.isReadOnly && props.canModifyParticipants && props.hasMultipleParticipants;
     const formattedAmount = CurrencyUtils.convertToDisplayString(props.iouAmount, props.iouCurrencyCode);
 
     const footerContent = useMemo(() => {

From b159a1d957c5a3cdb6a43551e622632f378b4f54 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Tue, 4 Jul 2023 03:04:19 +0700
Subject: [PATCH 10/69] Fix lint

---
 src/components/MoneyRequestConfirmationList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 30b39f357dbf..150a9ed9429b 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -171,7 +171,7 @@ function MoneyRequestConfirmationList(props) {
             });
         }
         return sections;
-    }, [selectedParticipants, getParticipantsWithAmount, props.hasMultipleParticipants, props.iouAmount, props.iouCurrencyCode, props.participants, translate, payeePersonalDetails]);
+    }, [props.participants, props.hasMultipleParticipants, props.iouAmount, props.iouCurrencyCode, getParticipantsWithAmount, selectedParticipants, payeePersonalDetails, translate, canModifyParticipants]);
 
     const selectedOptions = useMemo(() => {
         if (!props.hasMultipleParticipants) {

From 62253ce3ce273d73fb3dbf9e997fa2c60e4bf576 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Tue, 4 Jul 2023 04:02:24 +0700
Subject: [PATCH 11/69] Add shouldDisableWhoPaidSection

---
 src/components/MoneyRequestConfirmationList.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 150a9ed9429b..c671a91404f6 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -133,7 +133,8 @@ function MoneyRequestConfirmationList(props) {
     const selectedParticipants = useMemo(() => _.filter(props.participants, (participant) => participant.selected), [props.participants]);
     const payeePersonalDetails = useMemo(() => props.payeePersonalDetails || props.currentUserPersonalDetails, [props.payeePersonalDetails, props.currentUserPersonalDetails]);
     const canModifyParticipants = !props.isReadOnly && props.canModifyParticipants && props.hasMultipleParticipants;
-
+    const shouldDisableWhoPaidSection = canModifyParticipants;
+    
     const optionSelectorSections = useMemo(() => {
         const sections = [];
         const unselectedParticipants = _.filter(props.participants, (participant) => !participant.selected);
@@ -153,7 +154,7 @@ function MoneyRequestConfirmationList(props) {
                     data: [formattedPayeeOption],
                     shouldShow: true,
                     indexOffset: 0,
-                    isDisabled: canModifyParticipants,
+                    isDisabled: shouldDisableWhoPaidSection,
                 },
                 {
                     title: translate('moneyRequestConfirmationList.whoWasThere'),
@@ -171,7 +172,7 @@ function MoneyRequestConfirmationList(props) {
             });
         }
         return sections;
-    }, [props.participants, props.hasMultipleParticipants, props.iouAmount, props.iouCurrencyCode, getParticipantsWithAmount, selectedParticipants, payeePersonalDetails, translate, canModifyParticipants]);
+    }, [props.participants, props.hasMultipleParticipants, props.iouAmount, props.iouCurrencyCode, getParticipantsWithAmount, selectedParticipants, payeePersonalDetails, translate, shouldDisableWhoPaidSection]);
 
     const selectedOptions = useMemo(() => {
         if (!props.hasMultipleParticipants) {

From 78f418f408bff5bb3a6a54dd62325bd522291709 Mon Sep 17 00:00:00 2001
From: Daniel Gale-Rosen <dgalerosen@expensify.com>
Date: Mon, 3 Jul 2023 17:06:29 -0400
Subject: [PATCH 12/69] clean up conditionals

---
 src/pages/home/report/ReportActionItem.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 2afd28f934fe..d34862a93adf 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -151,12 +151,11 @@ function ReportActionItem(props) {
     const decisions = lodashGet(props, ['action', 'message', 0, 'moderationDecisions'], []);
     const latestDecision = lodashGet(_.last(decisions), 'decision', '');
     useEffect(() => {
-        if (!props.action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(latestDecision)) {
+        if (props.action.actionName !== CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(latestDecision)) {
             return;
         }
 
-        if (latestDecision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || latestDecision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {
-            setIsHidden(true);
+        if (_.contains([CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE, CONST.MODERATION.MODERATOR_DECISION_HIDDEN], latestDecision)) {            setIsHidden(true);
         }
         setModerationDecision(latestDecision);
     }, [latestDecision, props.action.actionName]);

From eb4e3220189ea12aa6dcbd13a536884bff126784 Mon Sep 17 00:00:00 2001
From: Daniel Gale-Rosen <dgalerosen@expensify.com>
Date: Mon, 3 Jul 2023 17:27:03 -0400
Subject: [PATCH 13/69] prettier

---
 src/pages/home/report/ReportActionItem.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index d34862a93adf..72d411fb9d2b 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -155,7 +155,8 @@ function ReportActionItem(props) {
             return;
         }
 
-        if (_.contains([CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE, CONST.MODERATION.MODERATOR_DECISION_HIDDEN], latestDecision)) {            setIsHidden(true);
+        if (_.contains([CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE, CONST.MODERATION.MODERATOR_DECISION_HIDDEN], latestDecision)) {
+            setIsHidden(true);
         }
         setModerationDecision(latestDecision);
     }, [latestDecision, props.action.actionName]);

From cc4ce9b4456249d74ba746ce4f26d8b6c63cce23 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 4 Jul 2023 10:30:26 +0700
Subject: [PATCH 14/69] fix: 20848 enable 2fa button in verify page

---
 .../BaseTwoFactorAuthForm.js                  | 21 +++++++++++++++--
 .../TwoFactorAuthForm/index.android.js        | 23 +++++++++++++++++--
 .../TwoFactorAuth/TwoFactorAuthForm/index.js  | 23 +++++++++++++++++--
 .../Security/TwoFactorAuth/VerifyPage.js      |  8 +++++--
 4 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js
index ca78219178ef..3b9395661c6d 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js
@@ -1,4 +1,4 @@
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useState, forwardRef, useImperativeHandle} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import MagicCodeInput from '../../../../../components/MagicCodeInput';
@@ -31,6 +31,7 @@ const defaultProps = {
 function BaseTwoFactorAuthForm(props) {
     const [formError, setFormError] = useState({});
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
+    const inputRef = React.useRef(null);
 
     /**
      * Handle text input and clear formError upon text change
@@ -53,6 +54,7 @@ function BaseTwoFactorAuthForm(props) {
      * Check that all the form fields are valid, then trigger the submit callback
      */
     const validateAndSubmitForm = useCallback(() => {
+        inputRef.current.blur();
         if (!twoFactorAuthCode.trim()) {
             setFormError({twoFactorAuthCode: 'twoFactorAuthForm.error.pleaseFillTwoFactorAuth'});
             return;
@@ -67,6 +69,12 @@ function BaseTwoFactorAuthForm(props) {
         Session.validateTwoFactorAuth(twoFactorAuthCode);
     }, [twoFactorAuthCode]);
 
+    useImperativeHandle(props.innerRef, () => ({
+        validateAndSubmitForm() {
+            validateAndSubmitForm();
+        },
+    }));
+
     return (
         <MagicCodeInput
             autoComplete={props.autoComplete}
@@ -78,6 +86,7 @@ function BaseTwoFactorAuthForm(props) {
             onChangeText={onTextInput}
             onFulfill={validateAndSubmitForm}
             errorText={formError.twoFactorAuthCode ? props.translate(formError.twoFactorAuthCode) : ErrorUtils.getLatestErrorMessage(props.account)}
+            ref={inputRef}
         />
     );
 }
@@ -90,4 +99,12 @@ export default compose(
     withOnyx({
         account: {key: ONYXKEYS.ACCOUNT},
     }),
-)(BaseTwoFactorAuthForm);
+)(
+    forwardRef((props, ref) => (
+        <BaseTwoFactorAuthForm
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            innerRef={ref}
+        />
+    )),
+);
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.android.js b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.android.js
index ea0d5e257e2f..ba7bb2186aa6 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.android.js
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.android.js
@@ -1,10 +1,29 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import BaseTwoFactorAuthForm from './BaseTwoFactorAuthForm';
 
-function TwoFactorAuthForm() {
-    return <BaseTwoFactorAuthForm autoComplete="sms-otp" />;
+const propTypes = {
+    /**
+     * A ref to forward to the Pressable
+     */
+    innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+};
+
+const defaultProps = {
+    innerRef: () => {},
+};
+
+function TwoFactorAuthForm(props) {
+    return (
+        <BaseTwoFactorAuthForm
+            ref={props.innerRef}
+            autoComplete="sms-otp"
+        />
+    );
 }
 
+TwoFactorAuthForm.propTypes = propTypes;
+TwoFactorAuthForm.defaultProps = defaultProps;
 TwoFactorAuthForm.displayName = 'TwoFactorAuthForm';
 
 export default TwoFactorAuthForm;
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.js b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.js
index c52e65facd6d..171322ecb32d 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.js
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/index.js
@@ -1,10 +1,29 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import BaseTwoFactorAuthForm from './BaseTwoFactorAuthForm';
 
-function TwoFactorAuthForm() {
-    return <BaseTwoFactorAuthForm autoComplete="one-time-code" />;
+const propTypes = {
+    /**
+     * A ref to forward to the Pressable
+     */
+    innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+};
+
+const defaultProps = {
+    innerRef: () => {},
+};
+
+function TwoFactorAuthForm(props) {
+    return (
+        <BaseTwoFactorAuthForm
+            ref={props.innerRef}
+            autoComplete="one-time-code"
+        />
+    );
 }
 
+TwoFactorAuthForm.propTypes = propTypes;
+TwoFactorAuthForm.defaultProps = defaultProps;
 TwoFactorAuthForm.displayName = 'TwoFactorAuthForm';
 
 export default TwoFactorAuthForm;
diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js
index 90765b45caa2..d487d7cc027f 100644
--- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js
+++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js
@@ -55,6 +55,8 @@ const defaultProps = {
 };
 
 function VerifyPage(props) {
+    const formRef = React.useRef(null);
+
     useEffect(() => {
         Session.clearAccountMessages();
     }, []);
@@ -139,15 +141,17 @@ function VerifyPage(props) {
                         <Text style={styles.mt11}>{props.translate('twoFactorAuth.enterCode')}</Text>
                     </View>
                     <View style={[styles.mt3, styles.mh5]}>
-                        <TwoFactorAuthForm />
+                        <TwoFactorAuthForm innerRef={formRef} />
                     </View>
                 </ScrollView>
                 <FixedFooter style={[styles.mtAuto, styles.pt2]}>
                     <Button
                         success
                         text={props.translate('common.next')}
-                        isDisabled
                         isLoading={props.account.isLoading}
+                        onPress={() => {
+                            formRef.current.validateAndSubmitForm();
+                        }}
                     />
                 </FixedFooter>
             </FullPageOfflineBlockingView>

From 9e164e43cf5569505f2bd3f4805c96301aec675e Mon Sep 17 00:00:00 2001
From: Eric Han <hanyl_fight@126.com>
Date: Tue, 4 Jul 2023 18:42:58 +0800
Subject: [PATCH 15/69] Fix: Capitalization in email search causing duplicate
 email in member invite preview

---
 src/libs/OptionsListUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index aa3f600cb9d7..381bebab64d2 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -621,7 +621,7 @@ function getOptions(
     let personalDetailsOptions = [];
     const reportMapForAccountIDs = {};
     const parsedPhoneNumber = parsePhoneNumber(LoginUtils.appendCountryCode(searchInputValue));
-    const searchValue = parsedPhoneNumber.possible ? parsedPhoneNumber.number.e164 : searchInputValue;
+    const searchValue = parsedPhoneNumber.possible ? parsedPhoneNumber.number.e164 : searchInputValue.toLowerCase();
 
     // Filter out all the reports that shouldn't be displayed
     const filteredReports = _.filter(reports, (report) => ReportUtils.shouldReportBeInOptionList(report, Navigation.getReportIDFromRoute(), false, iouReports, betas, policies));

From a1ef3e5a4c4f6b7fa9e7923e38cb731f3e1bd79a Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 4 Jul 2023 15:49:32 +0300
Subject: [PATCH 16/69] Remove use of childManagerEmail

---
 src/libs/ReportUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 113fe524804c..a3fedd7082b2 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1277,7 +1277,6 @@ function buildOptimisticTaskCommentReportAction(taskReportID, taskTitle, taskAss
     reportAction.reportAction.parentReportID = parentReportID;
     reportAction.reportAction.childType = CONST.REPORT.TYPE.TASK;
     reportAction.reportAction.childReportName = taskTitle;
-    reportAction.reportAction.childManagerEmail = taskAssignee;
     reportAction.reportAction.childManagerAccountID = taskAssigneeAccountID;
     reportAction.reportAction.childStatusNum = CONST.REPORT.STATUS.OPEN;
     reportAction.reportAction.childStateNum = CONST.REPORT.STATE_NUM.OPEN;

From 3236d3526fb4ffe756e021692dd7b4fdd071761e Mon Sep 17 00:00:00 2001
From: Pujan <shahpujan1992@gmail.com>
Date: Tue, 4 Jul 2023 19:26:01 +0530
Subject: [PATCH 17/69] show offline blocking view for 2fa enabled page

---
 .../Security/TwoFactorAuth/IsEnabledPage.js   | 75 ++++++++++---------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/pages/settings/Security/TwoFactorAuth/IsEnabledPage.js b/src/pages/settings/Security/TwoFactorAuth/IsEnabledPage.js
index 1dc0b8017095..01d986e2f4e5 100644
--- a/src/pages/settings/Security/TwoFactorAuth/IsEnabledPage.js
+++ b/src/pages/settings/Security/TwoFactorAuth/IsEnabledPage.js
@@ -11,6 +11,7 @@ import * as Expensicons from '../../../../components/Icon/Expensicons';
 import themeColors from '../../../../styles/themes/default';
 import styles from '../../../../styles/styles';
 import ConfirmModal from '../../../../components/ConfirmModal';
+import FullPageOfflineBlockingView from '../../../../components/BlockingViews/FullPageOfflineBlockingView';
 
 const defaultProps = {};
 
@@ -23,43 +24,45 @@ function IsEnabledPage(props) {
                 title={props.translate('twoFactorAuth.headerTitle')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_SECURITY)}
             />
-            <ScrollView>
-                <Section
-                    title={props.translate('twoFactorAuth.twoFactorAuthEnabled')}
-                    icon={Illustrations.ShieldYellow}
-                    menuItems={[
-                        {
-                            title: props.translate('twoFactorAuth.disableTwoFactorAuth'),
-                            onPress: () => {
-                                setIsConfirmModalVisible(true);
+            <FullPageOfflineBlockingView>
+                <ScrollView>
+                    <Section
+                        title={props.translate('twoFactorAuth.twoFactorAuthEnabled')}
+                        icon={Illustrations.ShieldYellow}
+                        menuItems={[
+                            {
+                                title: props.translate('twoFactorAuth.disableTwoFactorAuth'),
+                                onPress: () => {
+                                    setIsConfirmModalVisible(true);
+                                },
+                                icon: Expensicons.Close,
+                                iconFill: themeColors.danger,
+                                wrapperStyle: [styles.cardMenuItem],
                             },
-                            icon: Expensicons.Close,
-                            iconFill: themeColors.danger,
-                            wrapperStyle: [styles.cardMenuItem],
-                        },
-                    ]}
-                    containerStyles={[styles.twoFactorAuthSection]}
-                >
-                    <View style={styles.mv3}>
-                        <Text style={styles.textLabel}>{props.translate('twoFactorAuth.whatIsTwoFactorAuth')}</Text>
-                    </View>
-                </Section>
-                <ConfirmModal
-                    title={props.translate('twoFactorAuth.disableTwoFactorAuth')}
-                    onConfirm={() => {
-                        setIsConfirmModalVisible(false);
-                        Navigation.navigate(ROUTES.SETTINGS_2FA_DISABLE);
-                    }}
-                    onCancel={() => setIsConfirmModalVisible(false)}
-                    onModalHide={() => setIsConfirmModalVisible(false)}
-                    isVisible={isConfirmModalVisible}
-                    prompt={props.translate('twoFactorAuth.disableTwoFactorAuthConfirmation')}
-                    confirmText={props.translate('twoFactorAuth.disable')}
-                    cancelText={props.translate('common.cancel')}
-                    shouldShowCancelButton
-                    danger
-                />
-            </ScrollView>
+                        ]}
+                        containerStyles={[styles.twoFactorAuthSection]}
+                    >
+                        <View style={styles.mv3}>
+                            <Text style={styles.textLabel}>{props.translate('twoFactorAuth.whatIsTwoFactorAuth')}</Text>
+                        </View>
+                    </Section>
+                    <ConfirmModal
+                        title={props.translate('twoFactorAuth.disableTwoFactorAuth')}
+                        onConfirm={() => {
+                            setIsConfirmModalVisible(false);
+                            Navigation.navigate(ROUTES.SETTINGS_2FA_DISABLE);
+                        }}
+                        onCancel={() => setIsConfirmModalVisible(false)}
+                        onModalHide={() => setIsConfirmModalVisible(false)}
+                        isVisible={isConfirmModalVisible}
+                        prompt={props.translate('twoFactorAuth.disableTwoFactorAuthConfirmation')}
+                        confirmText={props.translate('twoFactorAuth.disable')}
+                        cancelText={props.translate('common.cancel')}
+                        shouldShowCancelButton
+                        danger
+                    />
+                </ScrollView>
+            </FullPageOfflineBlockingView>
         </ScreenWrapper>
     );
 }

From d0de724831f56ea42d8aece72b3f4209307143cb Mon Sep 17 00:00:00 2001
From: payal-lathidadiya <130229379+payal-lathidadiya@users.noreply.github.com>
Date: Tue, 4 Jul 2023 20:43:29 +0530
Subject: [PATCH 18/69] fix: emoji modal stops working in the chat when opening
 in the IOU report

---
 src/Expensify.js               | 3 +++
 src/pages/home/ReportScreen.js | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index e7c830ff2029..c85c2862e96e 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -29,6 +29,8 @@ import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/Popo
 import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
 import SplashScreenHider from './components/SplashScreenHider';
 import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
+import EmojiPicker from './components/EmojiPicker/EmojiPicker';
+import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
@@ -187,6 +189,7 @@ function Expensify(props) {
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
+                    <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                     {/* We include the modal for showing a new update at the top level so the option is always present. */}
                     {props.updateAvailable ? <UpdateAppModal /> : null}
                     {props.screenShareRequest ? (
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index efe86e94b2bf..789287e44d2b 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -33,7 +33,6 @@ import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
 import personalDetailsPropType from '../personalDetailsPropType';
 import withNavigationFocus from '../../components/withNavigationFocus';
 import getIsReportFullyVisible from '../../libs/getIsReportFullyVisible';
-import EmojiPicker from '../../components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from '../../libs/actions/EmojiPickerAction';
 import TaskHeader from '../../components/TaskHeader';
 import MoneyRequestHeader from '../../components/MoneyRequestHeader';
@@ -363,7 +362,6 @@ class ReportScreen extends React.Component {
                                 />
                             )}
 
-                            <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                             <PortalHost name={CONST.REPORT.DROP_HOST_NAME} />
                         </View>
                     </FullPageNotFoundView>

From ed82458bd1b324aa4e440eb485cce5e49dd1c629 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Tue, 4 Jul 2023 10:57:40 +0100
Subject: [PATCH 19/69] Migrate ReportActionsView.js to function component

---
 src/pages/home/report/ReportActionsView.js | 436 +++++++++++----------
 1 file changed, 221 insertions(+), 215 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index f3c9e67d79db..69f7278ef46e 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useRef, useState, useEffect, useContext, useCallback} from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
@@ -34,6 +34,7 @@ const propTypes = {
     reportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)),
 
     /** Whether the composer is full size */
+    /* eslint-disable-next-line react/no-unused-prop-types */
     isComposerFullSize: PropTypes.bool.isRequired,
 
     /** Information about the network */
@@ -57,240 +58,192 @@ const defaultProps = {
     policy: null,
 };
 
-class ReportActionsView extends React.Component {
-    constructor(props) {
-        super(props);
+function ReportActionsView(props) {
+    const context = useContext(ReportScreenContext);
 
-        this.didLayout = false;
-        this.didSubscribeToReportTypingEvents = false;
-        this.unsubscribeVisibilityListener = null;
-        this.hasCachedActions = _.size(props.reportActions) > 0;
+    const didLayout = useRef(false);
+    const didSubscribeToReportTypingEvents = useRef(false);
+    const unsubscribeVisibilityListener = useRef(null);
+    const hasCachedActions = useRef(_.size(props.reportActions) > 0);
 
-        this.reactionListRef = React.createRef();
-        this.state = {
-            isFloatingMessageCounterVisible: false,
-            newMarkerReportActionID: ReportUtils.getNewMarkerReportActionID(this.props.report, props.reportActions),
-        };
+    const [isFloatingMessageCounterVisible, setIsFloatingMessageCounterVisible] = useState(false);
+    const [newMarkerReportActionID, setNewMarkerReportActionID] = useState(ReportUtils.getNewMarkerReportActionID(props.report, props.reportActions));
 
-        this.currentScrollOffset = 0;
-        this.mostRecentIOUReportActionID = ReportActionsUtils.getMostRecentIOURequestActionID(props.reportActions);
-        this.trackScroll = this.trackScroll.bind(this);
-        this.toggleFloatingMessageCounter = this.toggleFloatingMessageCounter.bind(this);
-        this.loadMoreChats = this.loadMoreChats.bind(this);
-        this.recordTimeToMeasureItemLayout = this.recordTimeToMeasureItemLayout.bind(this);
-        this.scrollToBottomAndMarkReportAsRead = this.scrollToBottomAndMarkReportAsRead.bind(this);
-        this.openReportIfNecessary = this.openReportIfNecessary.bind(this);
-    }
+    const currentScrollOffset = useRef(0);
+    const mostRecentIOUReportActionID = useRef(ReportActionsUtils.getMostRecentIOURequestActionID(props.reportActions));
+
+    const unsubscribeFromNewActionEvent = useRef(null);
+
+    const prevReportActionsRef = useRef(props.reportActions);
+    const prevReportRef = useRef(props.report);
+    const prevNetworkRef = useRef(props.network);
+    const prevIsSmallScreenWidthRef = useRef(props.isSmallScreenWidth);
 
-    componentDidMount() {
-        this.unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
-            if (!this.isReportFullyVisible()) {
+    /**
+     * @returns {Boolean}
+     */
+    const isReportFullyVisible = useCallback(() => getIsReportFullyVisible(props.isFocused), [props.isFocused]);
+
+    const openReportIfNecessary = useCallback(() => {
+        // If the report is optimistic (AKA not yet created) we don't need to call openReport again
+        if (props.report.isOptimisticReport) {
+            return;
+        }
+
+        Report.openReport(props.report.reportID);
+    }, [props.report]);
+
+    useEffect(() => {
+        unsubscribeVisibilityListener.current = Visibility.onVisibilityChange(() => {
+            if (!isReportFullyVisible()) {
                 return;
             }
-
             // If the app user becomes active and they have no unread actions we clear the new marker to sync their device
             // e.g. they could have read these messages on another device and only just become active here
-            const hasUnreadActions = ReportUtils.isUnread(this.props.report);
+            const hasUnreadActions = ReportUtils.isUnread(props.report);
             if (!hasUnreadActions) {
-                this.setState({newMarkerReportActionID: ''});
+                setNewMarkerReportActionID('');
             }
         });
 
-        this.openReportIfNecessary();
+        openReportIfNecessary();
 
         // This callback is triggered when a new action arrives via Pusher and the event is emitted from Report.js. This allows us to maintain
         // a single source of truth for the "new action" event instead of trying to derive that a new action has appeared from looking at props.
-        this.unsubscribeFromNewActionEvent = Report.subscribeToNewActionEvent(this.props.report.reportID, (isFromCurrentUser, newActionID) => {
-            const isNewMarkerReportActionIDSet = !_.isEmpty(this.state.newMarkerReportActionID);
+        unsubscribeFromNewActionEvent.current = Report.subscribeToNewActionEvent(props.report.reportID, (isFromCurrentUser, newActionID) => {
+            const isNewMarkerReportActionIDSet = !_.isEmpty(newMarkerReportActionID);
 
             // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
             // they are now in the list.
             if (isFromCurrentUser) {
-                ReportScrollManager.scrollToBottom(this.context.flatListRef);
-
+                ReportScrollManager.scrollToBottom(context.flatListRef);
                 // If the current user sends a new message in the chat we clear the new marker since they have "read" the report
-                this.setState({newMarkerReportActionID: ''});
-            } else if (this.isReportFullyVisible()) {
+                setNewMarkerReportActionID('');
+            } else if (isReportFullyVisible()) {
                 // We use the scroll position to determine whether the report should be marked as read and the new line indicator reset.
                 // If the user is scrolled up and no new line marker is set we will set it otherwise we will do nothing so the new marker
                 // stays in it's previous position.
-                if (this.currentScrollOffset === 0) {
-                    Report.readNewestAction(this.props.report.reportID);
-                    this.setState({newMarkerReportActionID: ''});
+                if (currentScrollOffset.current === 0) {
+                    Report.readNewestAction(props.report.reportID);
+                    setNewMarkerReportActionID('');
                 } else if (!isNewMarkerReportActionIDSet) {
-                    this.setState({newMarkerReportActionID: newActionID});
+                    // The report is not in view and we received a comment from another user while the new marker is not set
+                    // so we will set the new marker now.
+                    setNewMarkerReportActionID(newActionID);
                 }
             } else if (!isNewMarkerReportActionIDSet) {
-                // The report is not in view and we received a comment from another user while the new marker is not set
-                // so we will set the new marker now.
-                this.setState({newMarkerReportActionID: newActionID});
+                setNewMarkerReportActionID(newActionID);
             }
         });
-    }
-
-    shouldComponentUpdate(nextProps, nextState) {
-        if (!_.isEqual(nextProps.reportActions, this.props.reportActions)) {
-            this.mostRecentIOUReportActionID = ReportActionsUtils.getMostRecentIOURequestActionID(nextProps.reportActions);
-            return true;
-        }
-
-        if (lodashGet(nextProps.network, 'isOffline') !== lodashGet(this.props.network, 'isOffline')) {
-            return true;
-        }
-
-        if (nextProps.report.isLoadingMoreReportActions !== this.props.report.isLoadingMoreReportActions) {
-            return true;
-        }
-
-        if (nextProps.report.isLoadingReportActions !== this.props.report.isLoadingReportActions) {
-            return true;
-        }
-
-        if (nextProps.report.lastReadTime !== this.props.report.lastReadTime) {
-            return true;
-        }
 
-        if (nextState.isFloatingMessageCounterVisible !== this.state.isFloatingMessageCounterVisible) {
-            return true;
-        }
-
-        if (nextState.newMarkerReportActionID !== this.state.newMarkerReportActionID) {
-            return true;
-        }
-
-        if (this.props.isSmallScreenWidth !== nextProps.isSmallScreenWidth) {
-            return true;
-        }
-
-        if (lodashGet(this.props.report, 'hasOutstandingIOU') !== lodashGet(nextProps.report, 'hasOutstandingIOU')) {
-            return true;
-        }
-
-        if (this.props.isComposerFullSize !== nextProps.isComposerFullSize) {
-            return true;
-        }
-
-        if (lodashGet(this.props.report, 'statusNum') !== lodashGet(nextProps.report, 'statusNum') || lodashGet(this.props.report, 'stateNum') !== lodashGet(nextProps.report, 'stateNum')) {
-            return true;
-        }
-
-        if (lodashGet(this.props, 'policy.avatar') !== lodashGet(nextProps, 'policy.avatar')) {
-            return true;
-        }
-
-        if (lodashGet(this.props, 'policy.name') !== lodashGet(nextProps, 'policy.name')) {
-            return true;
-        }
+        return () => {
+            if (unsubscribeVisibilityListener.current) {
+                unsubscribeVisibilityListener.current();
+            }
 
-        return !_.isEqual(lodashGet(this.props.report, 'icons', []), lodashGet(nextProps.report, 'icons', []));
-    }
+            if (unsubscribeFromNewActionEvent.current) {
+                unsubscribeFromNewActionEvent.current();
+            }
 
-    componentDidUpdate(prevProps) {
-        const isReportFullyVisible = this.isReportFullyVisible();
+            Report.unsubscribeFromReportChannel(props.report.reportID);
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
+    useEffect(() => {
+        const prevNetwork = prevNetworkRef.current;
         // When returning from offline to online state we want to trigger a request to OpenReport which
         // will fetch the reportActions data and mark the report as read. If the report is not fully visible
         // then we call ReconnectToReport which only loads the reportActions data without marking the report as read.
-        const wasNetworkChangeDetected = lodashGet(prevProps.network, 'isOffline') && !lodashGet(this.props.network, 'isOffline');
+        const wasNetworkChangeDetected = lodashGet(prevNetwork, 'isOffline') && !lodashGet(props.network, 'isOffline');
         if (wasNetworkChangeDetected) {
-            if (isReportFullyVisible) {
-                this.openReportIfNecessary();
+            if (isReportFullyVisible()) {
+                openReportIfNecessary();
             } else {
-                Report.reconnect(this.props.report.reportID);
+                Report.reconnect(props.report.reportID);
             }
         }
+        // update ref with current network state
+        prevNetworkRef.current = props.network;
+    }, [props.network, props.report, isReportFullyVisible, openReportIfNecessary]);
 
+    useEffect(() => {
+        const prevIsSmallScreenWidth = prevIsSmallScreenWidthRef.current;
         // If the view is expanded from mobile to desktop layout
         // we update the new marker position, mark the report as read, and fetch new report actions
-        const didScreenSizeIncrease = prevProps.isSmallScreenWidth && !this.props.isSmallScreenWidth;
-        const didReportBecomeVisible = isReportFullyVisible && didScreenSizeIncrease;
+        const didScreenSizeIncrease = prevIsSmallScreenWidth && !props.isSmallScreenWidth;
+        const didReportBecomeVisible = isReportFullyVisible() && didScreenSizeIncrease;
         if (didReportBecomeVisible) {
-            this.setState({
-                newMarkerReportActionID: ReportUtils.isUnread(this.props.report) ? ReportUtils.getNewMarkerReportActionID(this.props.report, this.props.reportActions) : '',
-            });
-            this.openReportIfNecessary();
+            setNewMarkerReportActionID(ReportUtils.isUnread(props.report) ? ReportUtils.getNewMarkerReportActionID(props.report, props.reportActions) : '');
+            openReportIfNecessary();
         }
+        // update ref with current state
+        prevIsSmallScreenWidthRef.current = props.isSmallScreenWidth;
+    }, [props.isSmallScreenWidth, props.report, props.reportActions, isReportFullyVisible, openReportIfNecessary]);
 
+    useEffect(() => {
+        const prevReportActions = prevReportActionsRef.current;
         // If the report is unread, we want to check if the number of actions has decreased. If so, then it seems that one of them was deleted. In this case, if the deleted action was the
         // one marking the unread point, we need to recalculate which action should be the unread marker.
-        if (ReportUtils.isUnread(this.props.report) && prevProps.reportActions.length > this.props.reportActions.length) {
-            this.setState({
-                newMarkerReportActionID: ReportUtils.getNewMarkerReportActionID(this.props.report, this.props.reportActions),
-            });
-        }
+        if (prevReportActions && ReportUtils.isUnread(props.report) && prevReportActions.length > props.report.length)
+            setNewMarkerReportActionID(ReportUtils.getNewMarkerReportActionID(props.report, props.reportActions));
+
+        prevReportActionsRef.current = props.reportActions;
+    }, [props.report, props.reportActions]);
 
+    useEffect(() => {
         // If the last unread message was deleted, remove the *New* green marker and the *New Messages* notification at scroll just as the deletion starts.
         if (
-            ReportUtils.isUnread(this.props.report) &&
-            this.props.reportActions.length > 0 &&
-            this.props.reportActions[0].pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
-            !this.props.network.isOffline
-        ) {
-            const reportActionsWithoutPendingOne = lodashCloneDeep(this.props.reportActions);
-            reportActionsWithoutPendingOne.shift();
-            const newMarkerReportActionID = ReportUtils.getNewMarkerReportActionID(this.props.report, reportActionsWithoutPendingOne);
-            if (newMarkerReportActionID !== this.state.newMarkerReportActionID) {
-                this.setState({newMarkerReportActionID});
-            }
+            !(
+                ReportUtils.isUnread(props.report) &&
+                props.reportActions.length > 0 &&
+                props.reportActions[0].pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
+                !props.network.isOffline
+            )
+        )
+            return;
+        const reportActionsWithoutPendingOne = lodashCloneDeep(props.reportActions);
+        reportActionsWithoutPendingOne.shift();
+        if (newMarkerReportActionID !== ReportUtils.getNewMarkerReportActionID(props.report, reportActionsWithoutPendingOne)) {
+            setNewMarkerReportActionID(ReportUtils.getNewMarkerReportActionID(props.report, reportActionsWithoutPendingOne));
         }
+    }, [props.report, props.reportActions, props.network, newMarkerReportActionID]);
 
+    useEffect(() => {
+        const prevReport = prevReportRef.current;
         // Checks to see if a report comment has been manually "marked as unread". All other times when the lastReadTime
         // changes it will be because we marked the entire report as read.
-        const didManuallyMarkReportAsUnread = prevProps.report.lastReadTime !== this.props.report.lastReadTime && ReportUtils.isUnread(this.props.report);
+        const didManuallyMarkReportAsUnread = prevReport && prevReport.lastReadTime !== props.report.lastReadTime && ReportUtils.isUnread(props.report);
         if (didManuallyMarkReportAsUnread) {
-            this.setState({newMarkerReportActionID: ReportUtils.getNewMarkerReportActionID(this.props.report, this.props.reportActions)});
+            setNewMarkerReportActionID(ReportUtils.getNewMarkerReportActionID(props.report, props.reportActions));
         }
+        // update ref with current report
+        prevReportRef.current = props.report;
+    }, [props.report, props.reportActions]);
 
+    useEffect(() => {
         // Ensures subscription event succeeds when the report/workspace room is created optimistically.
         // Check if the optimistic `OpenReport` or `AddWorkspaceRoom` has succeeded by confirming
         // any `pendingFields.createChat` or `pendingFields.addWorkspaceRoom` fields are set to null.
         // Existing reports created will have empty fields for `pendingFields`.
-        const didCreateReportSuccessfully = !this.props.report.pendingFields || (!this.props.report.pendingFields.addWorkspaceRoom && !this.props.report.pendingFields.createChat);
-        if (!this.didSubscribeToReportTypingEvents && didCreateReportSuccessfully) {
-            Report.subscribeToReportTypingEvents(this.props.report.reportID);
-            this.didSubscribeToReportTypingEvents = true;
+        const didCreateReportSuccessfully = !props.report.pendingFields || (!props.report.pendingFields.addWorkspaceRoom && !props.report.pendingFields.createChat);
+        if (!didSubscribeToReportTypingEvents && didCreateReportSuccessfully) {
+            Report.subscribeToReportTypingEvents(props.report.reportID);
+            didSubscribeToReportTypingEvents.current = true;
         }
-    }
-
-    componentWillUnmount() {
-        if (this.unsubscribeVisibilityListener) {
-            this.unsubscribeVisibilityListener();
-        }
-
-        if (this.unsubscribeFromNewActionEvent) {
-            this.unsubscribeFromNewActionEvent();
-        }
-
-        Report.unsubscribeFromReportChannel(this.props.report.reportID);
-    }
-
-    /**
-     * @returns {Boolean}
-     */
-    isReportFullyVisible() {
-        return getIsReportFullyVisible(this.props.isFocused);
-    }
-
-    // If the report is optimistic (AKA not yet created) we don't need to call openReport again
-    openReportIfNecessary() {
-        if (this.props.report.isOptimisticReport) {
-            return;
-        }
-
-        Report.openReport(this.props.report.reportID);
-    }
+    }, [props.report, didSubscribeToReportTypingEvents]);
 
     /**
      * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
      * displaying.
      */
-    loadMoreChats() {
+    const loadMoreChats = useCallback(() => {
         // Only fetch more if we are not already fetching so that we don't initiate duplicate requests.
-        if (this.props.report.isLoadingMoreReportActions) {
+        if (props.report.isLoadingMoreReportActions) {
             return;
         }
 
-        const oldestReportAction = _.last(this.props.reportActions);
+        const oldestReportAction = _.last(props.reportActions);
 
         // Don't load more chats if we're already at the beginning of the chat history
         if (oldestReportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) {
@@ -298,47 +251,51 @@ class ReportActionsView extends React.Component {
         }
 
         // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
-        Report.readOldestAction(this.props.report.reportID, oldestReportAction.reportActionID);
-    }
+        Report.readOldestAction(props.report.reportID, oldestReportAction.reportActionID);
+    }, [props.report, props.reportActions]);
 
-    scrollToBottomAndMarkReportAsRead() {
-        ReportScrollManager.scrollToBottom(this.context.flatListRef);
-        Report.readNewestAction(this.props.report.reportID);
-    }
+    const scrollToBottomAndMarkReportAsRead = useCallback(() => {
+        console.log('hello');
+        ReportScrollManager.scrollToBottom(context.flatListRef);
+        Report.readNewestAction(props.report.reportID);
+    }, [props.report]);
 
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.
      */
-    toggleFloatingMessageCounter() {
-        if (this.currentScrollOffset < -200 && !this.state.isFloatingMessageCounterVisible) {
-            this.setState({isFloatingMessageCounterVisible: true});
+    const toggleFloatingMessageCounter = useCallback(() => {
+        if (currentScrollOffset.current < -200 && !isFloatingMessageCounterVisible) {
+            setIsFloatingMessageCounterVisible(true);
         }
 
-        if (this.currentScrollOffset > -200 && this.state.isFloatingMessageCounterVisible) {
-            this.setState({isFloatingMessageCounterVisible: false});
+        if (currentScrollOffset.current > -200 && isFloatingMessageCounterVisible) {
+            setIsFloatingMessageCounterVisible(false);
         }
-    }
+    }, [currentScrollOffset, isFloatingMessageCounterVisible]);
 
     /**
      * keeps track of the Scroll offset of the main messages list
      *
      * @param {Object} {nativeEvent}
      */
-    trackScroll({nativeEvent}) {
-        this.currentScrollOffset = -nativeEvent.contentOffset.y;
-        this.toggleFloatingMessageCounter();
-    }
+    const trackScroll = useCallback(
+        ({nativeEvent}) => {
+            currentScrollOffset.current = -nativeEvent.contentOffset.y;
+            toggleFloatingMessageCounter();
+        },
+        [currentScrollOffset, toggleFloatingMessageCounter],
+    );
 
     /**
      * Runs when the FlatList finishes laying out
      */
-    recordTimeToMeasureItemLayout() {
-        if (this.didLayout) {
+    const recordTimeToMeasureItemLayout = useCallback(() => {
+        if (didLayout.current) {
             return;
         }
 
-        this.didLayout = true;
-        Timing.end(CONST.TIMING.SWITCH_REPORT, this.hasCachedActions ? CONST.TIMING.WARM : CONST.TIMING.COLD);
+        didLayout.current = true;
+        Timing.end(CONST.TIMING.SWITCH_REPORT, hasCachedActions.current ? CONST.TIMING.WARM : CONST.TIMING.COLD);
 
         // Capture the init measurement only once not per each chat switch as the value gets overwritten
         if (!ReportActionsView.initMeasured) {
@@ -347,41 +304,90 @@ class ReportActionsView extends React.Component {
         } else {
             Performance.markEnd(CONST.TIMING.SWITCH_REPORT);
         }
-    }
+    }, [didLayout, hasCachedActions]);
 
-    render() {
-        // Comments have not loaded at all yet do nothing
-        if (!_.size(this.props.reportActions)) {
-            return null;
-        }
-        return (
-            <>
-                <FloatingMessageCounter
-                    isActive={this.state.isFloatingMessageCounterVisible && !_.isEmpty(this.state.newMarkerReportActionID)}
-                    onClick={this.scrollToBottomAndMarkReportAsRead}
-                />
-                <ReportActionsList
-                    report={this.props.report}
-                    onScroll={this.trackScroll}
-                    onLayout={this.recordTimeToMeasureItemLayout}
-                    sortedReportActions={this.props.reportActions}
-                    mostRecentIOUReportActionID={this.mostRecentIOUReportActionID}
-                    isLoadingMoreReportActions={this.props.report.isLoadingMoreReportActions}
-                    loadMoreChats={this.loadMoreChats}
-                    newMarkerReportActionID={this.state.newMarkerReportActionID}
-                />
-                <PopoverReactionList
-                    ref={this.context.reactionListRef}
-                    report={this.props.report}
-                />
-                <CopySelectionHelper />
-            </>
-        );
+    // Comments have not loaded at all yet do nothing
+    if (!_.size(props.reportActions)) {
+        return null;
     }
+
+    return (
+        <>
+            <FloatingMessageCounter
+                isActive={isFloatingMessageCounterVisible && !_.isEmpty(newMarkerReportActionID)}
+                onClick={scrollToBottomAndMarkReportAsRead}
+            />
+            <ReportActionsList
+                report={props.report}
+                onScroll={trackScroll}
+                onLayout={recordTimeToMeasureItemLayout}
+                sortedReportActions={props.reportActions}
+                mostRecentIOUReportActionID={mostRecentIOUReportActionID.current}
+                isLoadingMoreReportActions={props.report.isLoadingMoreReportActions}
+                loadMoreChats={loadMoreChats}
+                newMarkerReportActionID={newMarkerReportActionID}
+            />
+            <PopoverReactionList
+                ref={context.reactionListRef}
+                report={props.report}
+            />
+            <CopySelectionHelper />
+        </>
+    );
 }
 
 ReportActionsView.propTypes = propTypes;
 ReportActionsView.defaultProps = defaultProps;
-ReportActionsView.contextType = ReportScreenContext;
+ReportActionsView.displayName = 'ReportActionsView';
+
+function arePropsEqual(oldProps, newProps) {
+    if (!_.isEqual(oldProps.reportActions, newProps.reportActions)) {
+        return false;
+    }
+
+    if (lodashGet(oldProps.network, 'isOffline') !== lodashGet(newProps.network, 'isOffline')) {
+        return false;
+    }
+
+    if (oldProps.report.isLoadingMoreReportActions !== newProps.report.isLoadingMoreReportActions) {
+        return false;
+    }
+
+    if (oldProps.report.isLoadingReportActions !== newProps.report.isLoadingReportActions) {
+        return false;
+    }
+
+    if (oldProps.report.lastReadTime !== newProps.report.lastReadTime) {
+        return false;
+    }
+
+    if (newProps.isSmallScreenWidth !== oldProps.isSmallScreenWidth) {
+        return false;
+    }
+
+    if (lodashGet(newProps.report, 'hasOutstandingIOU') !== lodashGet(oldProps.report, 'hasOutstandingIOU')) {
+        return false;
+    }
+
+    if (newProps.isComposerFullSize !== oldProps.isComposerFullSize) {
+        return false;
+    }
+
+    if (lodashGet(newProps.report, 'statusNum') !== lodashGet(oldProps.report, 'statusNum') || lodashGet(newProps.report, 'stateNum') !== lodashGet(oldProps.report, 'stateNum')) {
+        return false;
+    }
+
+    if (lodashGet(newProps, 'policy.avatar') !== lodashGet(oldProps, 'policy.avatar')) {
+        return false;
+    }
+
+    if (lodashGet(newProps, 'policy.name') !== lodashGet(oldProps, 'policy.name')) {
+        return false;
+    }
+
+    return _.isEqual(lodashGet(newProps.report, 'icons', []), lodashGet(oldProps.report, 'icons', []));
+}
+
+const MemoizedReportActionsView = React.memo(ReportActionsView, arePropsEqual);
 
-export default compose(Performance.withRenderTrace({id: '<ReportActionsView> rendering'}), withWindowDimensions, withNavigationFocus, withLocalize, withNetwork())(ReportActionsView);
+export default compose(Performance.withRenderTrace({id: '<ReportActionsView> rendering'}), withWindowDimensions, withNavigationFocus, withLocalize, withNetwork())(MemoizedReportActionsView);

From 1b9f172a843093fd658753cc5d74b529b7fae791 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Tue, 4 Jul 2023 18:02:19 +0100
Subject: [PATCH 20/69] include context.flatListRef  missing dependency in
 useCallback

---
 src/pages/home/report/ReportActionsView.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 69f7278ef46e..cf2883d46796 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -255,10 +255,9 @@ function ReportActionsView(props) {
     }, [props.report, props.reportActions]);
 
     const scrollToBottomAndMarkReportAsRead = useCallback(() => {
-        console.log('hello');
         ReportScrollManager.scrollToBottom(context.flatListRef);
         Report.readNewestAction(props.report.reportID);
-    }, [props.report]);
+    }, [props.report, context.flatListRef]);
 
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.

From fec434a218a53296a10c3bfa01e9fb898e1c1ba7 Mon Sep 17 00:00:00 2001
From: Pujan <shahpujan1992@gmail.com>
Date: Tue, 4 Jul 2023 22:44:38 +0530
Subject: [PATCH 21/69] corrected the value for optionrow keyForList

---
 src/pages/workspace/WorkspaceMembersPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index e4f8559e37b7..3d520f738ee0 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -334,7 +334,7 @@ function WorkspaceMembersPage(props) {
                                             type: CONST.ICON_TYPE_AVATAR,
                                         },
                                     ],
-                                    keyForList: item.accountID,
+                                    keyForList: String(item.accountID),
                                 }}
                                 onSelectRow={() => toggleUser(item.accountID, item.pendingAction)}
                             />

From 794dde6be2c4fe68bd7d08cd118e9dcb5105fa86 Mon Sep 17 00:00:00 2001
From: Florent De'Neve <florent@expensify.com>
Date: Tue, 4 Jul 2023 18:34:51 +0100
Subject: [PATCH 22/69] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 491784caa693..4d8de6c5501d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,11 +5,11 @@
 
 ### Fixed Issues
 <!---
-1. Please replace GH_LINK with a URL link to the GitHub issue this Pull Request is fixing.
-2. Please replace PROPOSAL: GH_LINK_ISSUE(COMMENT) with a URL link to your GitHub comment, which contains the approved proposal (i.e. the proposal that was approved by Expensify).
+1. Please postfix `$` with a URL link to the GitHub issue this Pull Request is fixing.
+2. Please postfix  `PROPOSAL:` with a URL link to your GitHub comment, which contains the approved proposal (i.e. the proposal that was approved by Expensify).
 
 Do NOT add the special GH keywords like `fixed` etc, we have our own process of managing the flow.
-It MUST be an entire link to the github issue and your comment proposal ; otherwise, the linking will not work as expected.
+It MUST be an entire link to the github issue and your comment proposal ; otherwise, the linking and its automation will not work as expected.
 
 Make sure this section looks similar to this (you can link multiple issues using the same formatting, just add a new line):
 
@@ -18,8 +18,8 @@ $ https://github.com/Expensify/App/issues/<number-of-the-issue(comment)>
 
 Do NOT only link the issue number like this: $ #<number-of-the-issue>
 --->
-$ GH_LINK
-PROPOSAL: GH_LINK_ISSUE(COMMENT)
+$ 
+PROPOSAL: 
 
 
 ### Tests

From 63ac96f33a894d7cbb10d2f641fd53bb29abf3e3 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Tue, 4 Jul 2023 21:15:30 +0100
Subject: [PATCH 23/69] [Fix] Remove duplicate code

---
 .../ReimbursementAccount/ReimbursementAccountPage.js   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 7b4681100f6b..69a5d0deb3cd 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -362,16 +362,6 @@ class ReimbursementAccountPage extends React.Component {
             );
         }
 
-        if (this.state.shouldShowContinueSetupButton) {
-            return (
-                <ContinueBankAccountSetup
-                    reimbursementAccount={this.props.reimbursementAccount}
-                    continue={this.continue}
-                    policyName={policyName}
-                />
-            );
-        }
-
         let errorText;
         const userHasPhonePrimaryEmail = Str.endsWith(this.props.session.email, CONST.SMS.DOMAIN);
         const throttledDate = lodashGet(this.props.reimbursementAccount, 'throttledDate');

From f66f6d39b24b856f25b419dde78be93eee63f0d8 Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Wed, 5 Jul 2023 08:58:54 +0530
Subject: [PATCH 24/69] PR intended changes

---
 src/components/MenuItem.js     | 5 +++--
 src/pages/tasks/NewTaskPage.js | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index a59dd6d7b971..7be79cb93267 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -67,6 +67,7 @@ const defaultProps = {
     hoverAndPressStyle: [],
     furtherDetails: '',
     furtherDetailsIcon: undefined,
+    numberOfLinesTitle: 1,
 };
 
 function MenuItem(props) {
@@ -79,8 +80,8 @@ function MenuItem(props) {
             props.icon && !_.isArray(props.icon) ? styles.ml3 : undefined,
             props.shouldShowBasicTitle ? undefined : styles.textStrong,
             props.shouldShowHeaderTitle ? styles.textHeadlineH1 : undefined,
+            props.numberOfLinesTitle > 1 ? styles.preWrap : styles.pre,
             props.interactive && props.disabled ? {...styles.userSelectNone} : undefined,
-            styles.pre,
             styles.ltr,
             isDeleted ? styles.offlineFeedback.deleted : undefined,
         ],
@@ -193,7 +194,7 @@ function MenuItem(props) {
                                     {Boolean(props.title) && (
                                         <Text
                                             style={titleTextStyle}
-                                            numberOfLines={1}
+                                            numberOfLines={props.numberOfLinesTitle}
                                         >
                                             {convertToLTR(props.title)}
                                         </Text>
diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
index f1c04a82bb0a..ea049d557da4 100644
--- a/src/pages/tasks/NewTaskPage.js
+++ b/src/pages/tasks/NewTaskPage.js
@@ -157,6 +157,7 @@ function NewTaskPage(props) {
                         title={props.task.description || ''}
                         onPress={() => Navigation.navigate(ROUTES.NEW_TASK_DESCRIPTION)}
                         shouldShowRightIcon
+                        numberOfLinesTitle={2}
                     />
                     <MenuItem
                         label={assignee.displayName ? props.translate('newTaskPage.assignee') : ''}

From 822ad2ea6cb39bc750433696f57e8fdb7342d627 Mon Sep 17 00:00:00 2001
From: situchan <Situchandrashil7@gmail.com>
Date: Wed, 5 Jul 2023 04:51:22 +0100
Subject: [PATCH 25/69] hide request money option in task report

---
 src/libs/ReportUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 113fe524804c..da6d8fd556b3 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -2237,8 +2237,8 @@ function canRequestMoney(report) {
  * @returns {Array}
  */
 function getMoneyRequestOptions(report, reportParticipants, betas) {
-    // In any thread, we do not allow any new money requests yet
-    if (isChatThread(report)) {
+    // In any thread or task report, we do not allow any new money requests yet
+    if (isChatThread(report) || isTaskReport(report)) {
         return [];
     }
 

From 41c9ee5237e6ad9ed6c322f8eb83a4a7139fa282 Mon Sep 17 00:00:00 2001
From: Jakub Trzebiatowski <cubuspl42@gmail.com>
Date: Tue, 27 Jun 2023 10:01:43 +0200
Subject: [PATCH 26/69] UserDetailsTooltip: Pass renderTooltipContentKey to
 Tooltip

---
 src/components/UserDetailsTooltip/index.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/UserDetailsTooltip/index.js b/src/components/UserDetailsTooltip/index.js
index 18069bc8fde8..2a3fc5079b55 100644
--- a/src/components/UserDetailsTooltip/index.js
+++ b/src/components/UserDetailsTooltip/index.js
@@ -56,7 +56,14 @@ function UserDetailsTooltip(props) {
         return props.children;
     }
 
-    return <Tooltip renderTooltipContent={renderTooltipContent}>{props.children}</Tooltip>;
+    return (
+        <Tooltip
+            renderTooltipContent={renderTooltipContent}
+            renderTooltipContentKey={[userDetails.displayName]}
+        >
+            {props.children}
+        </Tooltip>
+    );
 }
 
 UserDetailsTooltip.propTypes = propTypes;

From 76257f19a10df32d106fd030ae2d81dd0fbee988 Mon Sep 17 00:00:00 2001
From: Jakub Trzebiatowski <cubuspl42@gmail.com>
Date: Wed, 5 Jul 2023 11:35:28 +0200
Subject: [PATCH 27/69] UserDetailsTooltip: Add userDetails.login to
 renderTooltipContentKey

---
 src/components/UserDetailsTooltip/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UserDetailsTooltip/index.js b/src/components/UserDetailsTooltip/index.js
index 2a3fc5079b55..34383b5d716c 100644
--- a/src/components/UserDetailsTooltip/index.js
+++ b/src/components/UserDetailsTooltip/index.js
@@ -59,7 +59,7 @@ function UserDetailsTooltip(props) {
     return (
         <Tooltip
             renderTooltipContent={renderTooltipContent}
-            renderTooltipContentKey={[userDetails.displayName]}
+            renderTooltipContentKey={[userDetails.displayName, userDetails.login]}
         >
             {props.children}
         </Tooltip>

From 3c53108776870175f1dcdb216795da65343261e9 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 5 Jul 2023 11:09:35 +0100
Subject: [PATCH 28/69] using useMemo in isReportFullyVisible instead of
 useCallback, and replace ReportScrollManager with useReportScrollManager hook

---
 src/pages/home/report/ReportActionsView.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index cf2883d46796..67369e736de2 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -1,4 +1,4 @@
-import React, {useRef, useState, useEffect, useContext, useCallback} from 'react';
+import React, {useRef, useState, useEffect, useContext, useCallback, useMemo} from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
@@ -10,7 +10,7 @@ import Timing from '../../../libs/actions/Timing';
 import CONST from '../../../CONST';
 import compose from '../../../libs/compose';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
-import * as ReportScrollManager from '../../../libs/ReportScrollManager';
+import useReportScrollManager from '../../../hooks/useReportScrollManager';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import Performance from '../../../libs/Performance';
 import {withNetwork} from '../../../components/OnyxProvider';
@@ -61,6 +61,8 @@ const defaultProps = {
 function ReportActionsView(props) {
     const context = useContext(ReportScreenContext);
 
+    const reportScrollManager = useReportScrollManager();
+
     const didLayout = useRef(false);
     const didSubscribeToReportTypingEvents = useRef(false);
     const unsubscribeVisibilityListener = useRef(null);
@@ -82,7 +84,7 @@ function ReportActionsView(props) {
     /**
      * @returns {Boolean}
      */
-    const isReportFullyVisible = useCallback(() => getIsReportFullyVisible(props.isFocused), [props.isFocused]);
+    const isReportFullyVisible = useMemo(() => getIsReportFullyVisible(props.isFocused), [props.isFocused]);
 
     const openReportIfNecessary = useCallback(() => {
         // If the report is optimistic (AKA not yet created) we don't need to call openReport again
@@ -95,7 +97,7 @@ function ReportActionsView(props) {
 
     useEffect(() => {
         unsubscribeVisibilityListener.current = Visibility.onVisibilityChange(() => {
-            if (!isReportFullyVisible()) {
+            if (!isReportFullyVisible) {
                 return;
             }
             // If the app user becomes active and they have no unread actions we clear the new marker to sync their device
@@ -116,10 +118,10 @@ function ReportActionsView(props) {
             // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
             // they are now in the list.
             if (isFromCurrentUser) {
-                ReportScrollManager.scrollToBottom(context.flatListRef);
+                reportScrollManager.scrollToBottom(context.flatListRef);
                 // If the current user sends a new message in the chat we clear the new marker since they have "read" the report
                 setNewMarkerReportActionID('');
-            } else if (isReportFullyVisible()) {
+            } else if (isReportFullyVisible) {
                 // We use the scroll position to determine whether the report should be marked as read and the new line indicator reset.
                 // If the user is scrolled up and no new line marker is set we will set it otherwise we will do nothing so the new marker
                 // stays in it's previous position.
@@ -157,7 +159,7 @@ function ReportActionsView(props) {
         // then we call ReconnectToReport which only loads the reportActions data without marking the report as read.
         const wasNetworkChangeDetected = lodashGet(prevNetwork, 'isOffline') && !lodashGet(props.network, 'isOffline');
         if (wasNetworkChangeDetected) {
-            if (isReportFullyVisible()) {
+            if (isReportFullyVisible) {
                 openReportIfNecessary();
             } else {
                 Report.reconnect(props.report.reportID);
@@ -172,7 +174,7 @@ function ReportActionsView(props) {
         // If the view is expanded from mobile to desktop layout
         // we update the new marker position, mark the report as read, and fetch new report actions
         const didScreenSizeIncrease = prevIsSmallScreenWidth && !props.isSmallScreenWidth;
-        const didReportBecomeVisible = isReportFullyVisible() && didScreenSizeIncrease;
+        const didReportBecomeVisible = isReportFullyVisible && didScreenSizeIncrease;
         if (didReportBecomeVisible) {
             setNewMarkerReportActionID(ReportUtils.isUnread(props.report) ? ReportUtils.getNewMarkerReportActionID(props.report, props.reportActions) : '');
             openReportIfNecessary();
@@ -255,9 +257,9 @@ function ReportActionsView(props) {
     }, [props.report, props.reportActions]);
 
     const scrollToBottomAndMarkReportAsRead = useCallback(() => {
-        ReportScrollManager.scrollToBottom(context.flatListRef);
+        reportScrollManager.scrollToBottom(context.flatListRef);
         Report.readNewestAction(props.report.reportID);
-    }, [props.report, context.flatListRef]);
+    }, [reportScrollManager, props.report, context.flatListRef]);
 
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.

From fae175f3c76429b7f91f5b02f42e1cb0c5cc3936 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Tue, 4 Jul 2023 21:15:30 +0100
Subject: [PATCH 29/69] [Fix] Remove duplicate code

---
 .../ReimbursementAccount/ReimbursementAccountPage.js   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 7b4681100f6b..69a5d0deb3cd 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -362,16 +362,6 @@ class ReimbursementAccountPage extends React.Component {
             );
         }
 
-        if (this.state.shouldShowContinueSetupButton) {
-            return (
-                <ContinueBankAccountSetup
-                    reimbursementAccount={this.props.reimbursementAccount}
-                    continue={this.continue}
-                    policyName={policyName}
-                />
-            );
-        }
-
         let errorText;
         const userHasPhonePrimaryEmail = Str.endsWith(this.props.session.email, CONST.SMS.DOMAIN);
         const throttledDate = lodashGet(this.props.reimbursementAccount, 'throttledDate');

From 234b91d00cd3f1a3be465d798ccd2a4a6a022f2a Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Wed, 5 Jul 2023 16:15:50 +0530
Subject: [PATCH 30/69] pass as an array of object

---
 src/pages/DetailsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index ac42017d3c7c..c96b0fb5c66f 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -148,7 +148,7 @@ function DetailsPage(props) {
                                 >
                                     {({show}) => (
                                         <PressableWithoutFocus
-                                            style={styles.noOutline}
+                                            style={[styles.noOutline]}
                                             onPress={show}
                                         >
                                             <OfflineWithFeedback pendingAction={lodashGet(details, 'pendingFields.avatar', null)}>

From 22ecb15804ea7da0abe4aa966a1eba801067033e Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 5 Jul 2023 11:51:57 +0100
Subject: [PATCH 31/69] remove context.flatListRef arg from
 reportScrollManager.scrollToBottom()

---
 src/pages/home/report/ReportActionsView.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 67369e736de2..fc525efb162d 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -118,7 +118,7 @@ function ReportActionsView(props) {
             // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
             // they are now in the list.
             if (isFromCurrentUser) {
-                reportScrollManager.scrollToBottom(context.flatListRef);
+                reportScrollManager.scrollToBottom();
                 // If the current user sends a new message in the chat we clear the new marker since they have "read" the report
                 setNewMarkerReportActionID('');
             } else if (isReportFullyVisible) {
@@ -257,9 +257,9 @@ function ReportActionsView(props) {
     }, [props.report, props.reportActions]);
 
     const scrollToBottomAndMarkReportAsRead = useCallback(() => {
-        reportScrollManager.scrollToBottom(context.flatListRef);
+        reportScrollManager.scrollToBottom();
         Report.readNewestAction(props.report.reportID);
-    }, [reportScrollManager, props.report, context.flatListRef]);
+    }, [reportScrollManager, props.report]);
 
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.

From 963b9e41ce2d5d9d134ac67bedaa902362118845 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:00:20 +0100
Subject: [PATCH 32/69] remove ReportScrollManager files as we don't need it
 anymore

---
 src/libs/ReportScrollManager/index.js        | 30 --------------------
 src/libs/ReportScrollManager/index.native.js | 28 ------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 src/libs/ReportScrollManager/index.js
 delete mode 100644 src/libs/ReportScrollManager/index.native.js

diff --git a/src/libs/ReportScrollManager/index.js b/src/libs/ReportScrollManager/index.js
deleted file mode 100644
index 1dd9922b33b8..000000000000
--- a/src/libs/ReportScrollManager/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Scroll to the provided index. On non-native implementations we do not want to scroll when we are scrolling because
- * we are editing a comment.
- *
- * @param {Object} ref
- * @param {Object} index
- * @param {Boolean} isEditing
- */
-function scrollToIndex(ref, index, isEditing) {
-    if (!ref.current || isEditing) {
-        return;
-    }
-
-    ref.current.scrollToIndex(index);
-}
-
-/**
- * Scroll to the bottom of the flatlist.
- *
- * @param {Object} ref
- */
-function scrollToBottom(ref) {
-    if (!ref.current) {
-        return;
-    }
-
-    ref.current.scrollToOffset({animated: false, offset: 0});
-}
-
-export {scrollToIndex, scrollToBottom};
diff --git a/src/libs/ReportScrollManager/index.native.js b/src/libs/ReportScrollManager/index.native.js
deleted file mode 100644
index 570d3a72acac..000000000000
--- a/src/libs/ReportScrollManager/index.native.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Scroll to the provided index.
- *
- * @param {Object} ref
- * @param {Object} index
- */
-function scrollToIndex(ref, index) {
-    if (!ref.current) {
-        return;
-    }
-
-    ref.current.scrollToIndex(index);
-}
-
-/**
- * Scroll to the bottom of the flatlist.
- *
- * @param {Object} ref
- */
-function scrollToBottom(ref) {
-    if (!ref.current) {
-        return;
-    }
-
-    ref.current.scrollToOffset({animated: false, offset: 0});
-}
-
-export {scrollToIndex, scrollToBottom};

From b2b5a23ce4d14983c2622307c9c979d9e66389e6 Mon Sep 17 00:00:00 2001
From: Florent De'Neve <florent@expensify.com>
Date: Wed, 5 Jul 2023 13:15:25 +0100
Subject: [PATCH 33/69] Update .github/PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4d8de6c5501d..3e574f732d53 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,8 +5,8 @@
 
 ### Fixed Issues
 <!---
-1. Please postfix `$` with a URL link to the GitHub issue this Pull Request is fixing.
-2. Please postfix  `PROPOSAL:` with a URL link to your GitHub comment, which contains the approved proposal (i.e. the proposal that was approved by Expensify).
+1. Please postfix `$` with a URL link to the GitHub issue this Pull Request is fixing. For example, `$ https://github.com/Expensify/App/issues/123`.
+2. Please postfix  `PROPOSAL:` with a URL link to your GitHub comment, which contains the approved proposal (i.e. the proposal that was approved by Expensify).  For example, `PROPOSAL: https://github.com/Expensify/App/issues/123#issuecomment-1369752925`
 
 Do NOT add the special GH keywords like `fixed` etc, we have our own process of managing the flow.
 It MUST be an entire link to the github issue and your comment proposal ; otherwise, the linking and its automation will not work as expected.

From d66432cde1bc9efd100e35dbda0fdf0b3dc7fe1f Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Jul 2023 22:49:52 +0700
Subject: [PATCH 34/69] fix: 22150 main task description updated when subtask
 is modified

---
 src/components/TaskHeader.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js
index 3fedfe830755..e7d1252cb27b 100644
--- a/src/components/TaskHeader.js
+++ b/src/components/TaskHeader.js
@@ -24,6 +24,7 @@ import * as TaskUtils from '../libs/actions/Task';
 import * as UserUtils from '../libs/UserUtils';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
 import ONYXKEYS from '../ONYXKEYS';
+import withNavigationFocus from './withNavigationFocus';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -37,6 +38,9 @@ const propTypes = {
         accountID: PropTypes.number,
     }),
 
+    /** Whether Button is on active screen */
+    isFocused: PropTypes.bool.isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -55,8 +59,11 @@ function TaskHeader(props) {
     const isCompleted = ReportUtils.isTaskCompleted(props.report);
 
     useEffect(() => {
+        if (!props.isFocused) {
+            return;
+        }
         TaskUtils.setTaskReport(props.report);
-    }, [props.report]);
+    }, [props.report, props.isFocused]);
 
     return (
         <View style={styles.borderBottom}>
@@ -143,6 +150,7 @@ TaskHeader.displayName = 'TaskHeader';
 export default compose(
     withWindowDimensions,
     withLocalize,
+    withNavigationFocus,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,

From 4da00f17e548fe0a4ae6866d7e17d9308440a98f Mon Sep 17 00:00:00 2001
From: Eric Han <hanyl_fight@126.com>
Date: Thu, 6 Jul 2023 00:48:20 +0800
Subject: [PATCH 35/69] fix: inconsistency error for zip code and tax ID
 contains emoji

---
 src/CONST.js                | 2 +-
 src/libs/ValidationUtils.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 86e819127c3b..e6b3db7a6309 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1120,7 +1120,7 @@ const CONST = {
         POSITIVE_INTEGER: /^\d+$/,
         PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
         ANY_VALUE: /^.+$/,
-        ZIP_CODE: /[0-9]{5}(?:[- ][0-9]{4})?/,
+        ZIP_CODE: /^[0-9]{5}(?:[- ][0-9]{4})?$/,
         INDUSTRY_CODE: /^[0-9]{6}$/,
         SSN_LAST_FOUR: /^(?!0000)[0-9]{4}$/,
         SSN_FULL_NINE: /^(?!0000)[0-9]{9}$/,
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 6f05da08c703..c120f649b401 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -419,7 +419,7 @@ function isValidRoomName(roomName) {
  * @returns {Boolean}
  */
 function isValidTaxID(taxID) {
-    return taxID && CONST.REGEX.TAX_ID.test(taxID.replace(CONST.REGEX.NON_NUMERIC, ''));
+    return taxID && CONST.REGEX.TAX_ID.test(taxID);
 }
 
 /**

From 64ff1d1523903fbcce814c428305b75e1c438e51 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Thu, 6 Jul 2023 00:15:42 +0700
Subject: [PATCH 36/69] Fix lint

---
 src/components/MoneyRequestConfirmationList.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index c671a91404f6..512018706bcb 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -134,7 +134,7 @@ function MoneyRequestConfirmationList(props) {
     const payeePersonalDetails = useMemo(() => props.payeePersonalDetails || props.currentUserPersonalDetails, [props.payeePersonalDetails, props.currentUserPersonalDetails]);
     const canModifyParticipants = !props.isReadOnly && props.canModifyParticipants && props.hasMultipleParticipants;
     const shouldDisableWhoPaidSection = canModifyParticipants;
-    
+
     const optionSelectorSections = useMemo(() => {
         const sections = [];
         const unselectedParticipants = _.filter(props.participants, (participant) => !participant.selected);
@@ -172,7 +172,17 @@ function MoneyRequestConfirmationList(props) {
             });
         }
         return sections;
-    }, [props.participants, props.hasMultipleParticipants, props.iouAmount, props.iouCurrencyCode, getParticipantsWithAmount, selectedParticipants, payeePersonalDetails, translate, shouldDisableWhoPaidSection]);
+    }, [
+        props.participants,
+        props.hasMultipleParticipants,
+        props.iouAmount,
+        props.iouCurrencyCode,
+        getParticipantsWithAmount,
+        selectedParticipants,
+        payeePersonalDetails,
+        translate,
+        shouldDisableWhoPaidSection,
+    ]);
 
     const selectedOptions = useMemo(() => {
         if (!props.hasMultipleParticipants) {

From cc29b60a90b82eaf20721ff1f0a1bb22e720f542 Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Thu, 6 Jul 2023 00:21:31 +0700
Subject: [PATCH 37/69] Update JSDoc

---
 src/libs/ErrorUtils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/ErrorUtils.js b/src/libs/ErrorUtils.js
index d358105477a2..81899cb7c849 100644
--- a/src/libs/ErrorUtils.js
+++ b/src/libs/ErrorUtils.js
@@ -89,9 +89,8 @@ function getLatestErrorField(onyxData, fieldName) {
 }
 
 /**
- * Get the first error in the errorFields ordering by its key
- *
  * @param {Object} onyxData
+ * @param {Object} onyxData.errorFields
  * @param {String} fieldName
  * @returns {Object}
  */

From 22853971265da5d6cd34d778a33fad994085c88a Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Wed, 5 Jul 2023 23:02:11 +0530
Subject: [PATCH 38/69] another console error fix

---
 src/pages/DetailsPage.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index c96b0fb5c66f..a5540843451a 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -150,6 +150,8 @@ function DetailsPage(props) {
                                         <PressableWithoutFocus
                                             style={[styles.noOutline]}
                                             onPress={show}
+                                            accessibilityLabel={props.translate('common.details')}
+                                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
                                         >
                                             <OfflineWithFeedback pendingAction={lodashGet(details, 'pendingFields.avatar', null)}>
                                                 <Avatar

From fd2e29afd92190b0b75dedc8be02bab4b201b759 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Thu, 6 Jul 2023 00:38:09 +0700
Subject: [PATCH 39/69] fix: null check

---
 .../TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js  | 4 +++-
 src/pages/settings/Security/TwoFactorAuth/VerifyPage.js       | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js
index 3b9395661c6d..7455a19f1131 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.js
@@ -54,7 +54,9 @@ function BaseTwoFactorAuthForm(props) {
      * Check that all the form fields are valid, then trigger the submit callback
      */
     const validateAndSubmitForm = useCallback(() => {
-        inputRef.current.blur();
+        if (inputRef.current) {
+            inputRef.current.blur();
+        }
         if (!twoFactorAuthCode.trim()) {
             setFormError({twoFactorAuthCode: 'twoFactorAuthForm.error.pleaseFillTwoFactorAuth'});
             return;
diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js
index d487d7cc027f..8b91fdbe8693 100644
--- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js
+++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js
@@ -150,6 +150,9 @@ function VerifyPage(props) {
                         text={props.translate('common.next')}
                         isLoading={props.account.isLoading}
                         onPress={() => {
+                            if (!formRef.current) {
+                                return;
+                            }
                             formRef.current.validateAndSubmitForm();
                         }}
                     />

From a9b1f556b3ecabdd641901d7f7ff7f3b1270eb3f Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Wed, 5 Jul 2023 23:32:23 +0530
Subject: [PATCH 40/69] remove last replay text from thread replay

---
 src/pages/home/report/ReportActionItemThread.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js
index c17a2d11d344..be97660677e5 100644
--- a/src/pages/home/report/ReportActionItemThread.js
+++ b/src/pages/home/report/ReportActionItemThread.js
@@ -65,7 +65,7 @@ function ReportActionItemThread(props) {
                             selectable={false}
                             numberOfLines={1}
                             style={[styles.ml2, styles.textMicroSupporting, styles.flex1]}
-                        >{`${props.translate('threads.lastReply')} ${timeStamp}`}</Text>
+                        >{`${timeStamp}`}</Text>
                     </View>
                 </View>
             </PressableWithoutFeedback>

From 3029a9433a6cd8ac72703b4ac37eb8062a4642ff Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Wed, 5 Jul 2023 23:33:35 +0530
Subject: [PATCH 41/69] Allow Capital time stamp

---
 src/pages/home/report/ReportActionItemThread.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js
index be97660677e5..d62fbb5eb2c1 100644
--- a/src/pages/home/report/ReportActionItemThread.js
+++ b/src/pages/home/report/ReportActionItemThread.js
@@ -35,7 +35,7 @@ function ReportActionItemThread(props) {
     const numberOfRepliesText = props.numberOfReplies > CONST.MAX_THREAD_REPLIES_PREVIEW ? `${CONST.MAX_THREAD_REPLIES_PREVIEW}+` : `${props.numberOfReplies}`;
     const replyText = props.numberOfReplies === 1 ? props.translate('threads.reply') : props.translate('threads.replies');
 
-    const timeStamp = props.datetimeToCalendarTime(props.mostRecentReply, false, true);
+    const timeStamp = props.datetimeToCalendarTime(props.mostRecentReply, false);
 
     return (
         <View style={[styles.chatItemMessage]}>

From 4dd3608b33502586e1ed7f35de37090ff8f348bc Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Wed, 5 Jul 2023 23:38:30 +0530
Subject: [PATCH 42/69] Remove unwanted translation

---
 src/languages/en.js | 1 -
 src/languages/es.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index f6989d32f35a..8e4ebc98ab87 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1421,7 +1421,6 @@ export default {
         deletedMessage: '[Deleted message]',
     },
     threads: {
-        lastReply: 'Last reply',
         replies: 'Replies',
         reply: 'Reply',
         parentNavigationSummary: ({rootReportName, workspaceName}) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
diff --git a/src/languages/es.js b/src/languages/es.js
index f765ce0270df..295b63d7a773 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -1890,7 +1890,6 @@ export default {
         deletedMessage: '[Mensaje eliminado]',
     },
     threads: {
-        lastReply: 'Última respuesta',
         replies: 'Respuestas',
         reply: 'Respuesta',
         parentNavigationSummary: ({rootReportName, workspaceName}) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,

From 9810bcd488e39701436b160d90772c66aa6a2968 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:50:10 +0100
Subject: [PATCH 43/69] put each task performed when the component mounts into
 it's own useEffect call

---
 src/pages/home/report/ReportActionsView.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index fc525efb162d..6fe680edf1bb 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -107,9 +107,15 @@ function ReportActionsView(props) {
                 setNewMarkerReportActionID('');
             }
         });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
+    useEffect(() => {
         openReportIfNecessary();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
+    useEffect(() => {
         // This callback is triggered when a new action arrives via Pusher and the event is emitted from Report.js. This allows us to maintain
         // a single source of truth for the "new action" event instead of trying to derive that a new action has appeared from looking at props.
         unsubscribeFromNewActionEvent.current = Report.subscribeToNewActionEvent(props.report.reportID, (isFromCurrentUser, newActionID) => {
@@ -139,10 +145,6 @@ function ReportActionsView(props) {
         });
 
         return () => {
-            if (unsubscribeVisibilityListener.current) {
-                unsubscribeVisibilityListener.current();
-            }
-
             if (unsubscribeFromNewActionEvent.current) {
                 unsubscribeFromNewActionEvent.current();
             }
@@ -202,8 +204,9 @@ function ReportActionsView(props) {
                 props.reportActions[0].pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
                 !props.network.isOffline
             )
-        )
+        ) {
             return;
+        }
         const reportActionsWithoutPendingOne = lodashCloneDeep(props.reportActions);
         reportActionsWithoutPendingOne.shift();
         if (newMarkerReportActionID !== ReportUtils.getNewMarkerReportActionID(props.report, reportActionsWithoutPendingOne)) {

From 7161e846d16b2fd318d8992b2a2abc1fac3cd556 Mon Sep 17 00:00:00 2001
From: situchan <Situchandrashil7@gmail.com>
Date: Thu, 6 Jul 2023 05:40:02 +0100
Subject: [PATCH 44/69] add missing path in rhp navigation link

---
 src/libs/Navigation/linkTo.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/Navigation/linkTo.js b/src/libs/Navigation/linkTo.js
index ad6052ca4d09..c86c15c38146 100644
--- a/src/libs/Navigation/linkTo.js
+++ b/src/libs/Navigation/linkTo.js
@@ -35,6 +35,7 @@ function getMinimalAction(action, state) {
             payload: {
                 name: currentAction.payload.params.screen,
                 params: currentAction.payload.params.params,
+                path: currentAction.payload.params.path,
             },
             target: currentTargetKey,
         };

From 0f8a17d5fe922d9d53bfc8368bd2574b91746d28 Mon Sep 17 00:00:00 2001
From: dhairyasenjaliya <dhairyasenjaliya@gmail.com>
Date: Thu, 6 Jul 2023 12:58:58 +0530
Subject: [PATCH 45/69] Code cleanup

---
 src/pages/home/report/ReportActionItemThread.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js
index d62fbb5eb2c1..d4d0b78d4de1 100644
--- a/src/pages/home/report/ReportActionItemThread.js
+++ b/src/pages/home/report/ReportActionItemThread.js
@@ -65,7 +65,9 @@ function ReportActionItemThread(props) {
                             selectable={false}
                             numberOfLines={1}
                             style={[styles.ml2, styles.textMicroSupporting, styles.flex1]}
-                        >{`${timeStamp}`}</Text>
+                        >
+                            {timeStamp}
+                        </Text>
                     </View>
                 </View>
             </PressableWithoutFeedback>

From ce853bfa14269010d5e7194ca481a5c88db3ae25 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 6 Jul 2023 10:49:47 +0300
Subject: [PATCH 46/69] Remove all uses of actorEmail

---
 src/libs/E2E/apiMocks/openReport.js           |  1 -
 src/libs/ReportActionsUtils.js                |  2 +-
 src/libs/ReportUtils.js                       | 16 +++++-----------
 src/libs/actions/Task.js                      | 18 +++++++++++++-----
 .../report/ContextMenu/ContextMenuActions.js  |  2 +-
 src/pages/tasks/NewTaskPage.js                | 11 -----------
 tests/actions/IOUTest.js                      |  2 --
 tests/actions/ReportTest.js                   |  3 ---
 tests/ui/UnreadIndicatorsTest.js              | 19 +++++++++----------
 tests/utils/TestHelper.js                     |  4 +---
 10 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/src/libs/E2E/apiMocks/openReport.js b/src/libs/E2E/apiMocks/openReport.js
index 3eb9c7890299..8ad00627b52a 100644
--- a/src/libs/E2E/apiMocks/openReport.js
+++ b/src/libs/E2E/apiMocks/openReport.js
@@ -67,7 +67,6 @@ export default () => ({
                             text: '123 Ios',
                         },
                     ],
-                    actorEmail: 'fake3@gmail.com',
                     actorAccountID: 10773236,
                     message: [
                         {
diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 86096b300c12..9a280711e947 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -266,7 +266,7 @@ function isConsecutiveActionMadeByPreviousActor(reportActions, actionIndex) {
         return false;
     }
 
-    return currentAction.actorEmail === previousAction.actorEmail;
+    return currentAction.actorAccountID === previousAction.actorAccountID;
 }
 
 /**
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 1631b71d6049..145b080e6c81 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -199,7 +199,7 @@ function sortReportsByLastRead(reports) {
  */
 function canEditReportAction(reportAction) {
     return (
-        reportAction.actorEmail === currentUserEmail &&
+        reportAction.actorAccountID === currentUserAccountID &&
         reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT &&
         !isReportMessageAttachment(lodashGet(reportAction, ['message', 0], {})) &&
         !ReportActionsUtils.isDeletedAction(reportAction) &&
@@ -235,7 +235,7 @@ function canDeleteReportAction(reportAction, reportID) {
     ) {
         return false;
     }
-    if (reportAction.actorEmail === currentUserEmail) {
+    if (reportAction.actorAccountID === currentUserAccountID) {
         return true;
     }
     const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
@@ -732,12 +732,12 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
     if (isChatThread(report)) {
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
 
-        const actorEmail = lodashGet(parentReportAction, 'actorEmail', '');
-        const actorAccountID = lodashGet(parentReportAction, 'actorAccountID', '');
+        const actorAccountID = lodashGet(parentReportAction, 'actorAccountID', 0);
+        const actorDisplayName = lodashGet(allPersonalDetails, [actorAccountID, 'displayName'], '');
         const actorIcon = {
             id: actorAccountID,
             source: UserUtils.getAvatar(lodashGet(personalDetails, [actorAccountID, 'avatar']), actorAccountID),
-            name: actorEmail,
+            name: actorDisplayName,
             type: CONST.ICON_TYPE_AVATAR,
         };
 
@@ -1222,7 +1222,6 @@ function buildOptimisticAddCommentReportAction(text, file) {
         reportAction: {
             reportActionID: NumberUtils.rand64(),
             actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
-            actorEmail: currentUserEmail,
             actorAccountID: currentUserAccountID,
             person: [
                 {
@@ -1455,7 +1454,6 @@ function buildOptimisticIOUReportAction(type, amount, currency, comment, partici
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
         actorAccountID: currentUserAccountID,
-        actorEmail: currentUserEmail,
         automatic: false,
         avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
         isAttachment: false,
@@ -1494,7 +1492,6 @@ function buildOptimisticReportPreview(reportID, iouReportID, payeeAccountID) {
         originalMessage: {
             linkedReportID: iouReportID,
         },
-        actorEmail: currentUserEmail,
         actorAccountID: currentUserAccountID,
     };
 }
@@ -1509,7 +1506,6 @@ function buildOptimisticTaskReportAction(taskReportID, actionName, message = '')
     return {
         actionName,
         actorAccountID: currentUserAccountID,
-        actorEmail: currentUserEmail,
         automatic: false,
         avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
         isAttachment: false,
@@ -1608,7 +1604,6 @@ function buildOptimisticCreatedReportAction(ownerEmail) {
         actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         actorAccountID: currentUserAccountID,
-        actorEmail: currentUserEmail,
         message: [
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
@@ -1648,7 +1643,6 @@ function buildOptimisticEditedTaskReportAction(ownerEmail) {
         actionName: CONST.REPORT.ACTIONS.TYPE.TASKEDITED,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         actorAccountID: currentUserAccountID,
-        actorEmail: currentUserEmail,
         message: [
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index 3d19a632a634..610315b63e84 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -13,6 +13,16 @@ import * as UserUtils from '../UserUtils';
 import * as PersonalDetailsUtils from '../PersonalDetailsUtils';
 import * as ReportActionsUtils from '../ReportActionsUtils';
 
+let currentUserEmail;
+let currentUserAccountID;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        currentUserEmail = lodashGet(val, 'email', '');
+        currentUserAccountID = lodashGet(val, 'accountID', 0);
+    },
+});
+
 /**
  * Clears out the task info from the store
  */
@@ -24,8 +34,6 @@ function clearOutTaskInfo() {
  * Assign a task to a user
  * Function title is createTask for consistency with the rest of the actions
  * and also because we can create a task without assigning it to anyone
- * @param {String} currentUserEmail
- * @param {Number} currentUserAccountID
  * @param {String} parentReportID
  * @param {String} title
  * @param {String} description
@@ -34,7 +42,7 @@ function clearOutTaskInfo() {
  *
  */
 
-function createTaskAndNavigate(currentUserEmail, currentUserAccountID, parentReportID, title, description, assignee, assigneeAccountID = 0) {
+function createTaskAndNavigate(parentReportID, title, description, assignee, assigneeAccountID = 0) {
     // Create the task report
     const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserEmail, currentUserAccountID, assigneeAccountID, parentReportID, title, description);
 
@@ -251,7 +259,7 @@ function reopenTask(taskReportID, taskTitle) {
                 statusNum: CONST.REPORT.STATUS.OPEN,
                 lastVisibleActionCreated: reopenedTaskReportAction.created,
                 lastMessageText: message,
-                lastActorEmail: reopenedTaskReportAction.actorEmail,
+                lastActorEmail: currentUserEmail,
                 lastActorAccountID: reopenedTaskReportAction.actorAccountID,
                 lastReadTime: reopenedTaskReportAction.created,
             },
@@ -586,7 +594,7 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
             value: {
                 lastVisibleActionCreated: optimisticCancelReportAction.created,
                 lastMessageText: message,
-                lastActorEmail: optimisticCancelReportAction.actorEmail,
+                lastActorEmail: currentUserEmail,
                 lastActorAccountID: optimisticCancelReportAction.actorAccountID,
             },
         },
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index b05c29804d19..4b7ddaec1f99 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -325,7 +325,7 @@ export default [
             !isArchivedRoom &&
             !isChronosReport &&
             !ReportUtils.isConciergeChatReport(reportID) &&
-            reportAction.actorEmail !== CONST.EMAIL.CONCIERGE,
+            reportAction.actorAccountID !== CONST.ACCOUNT_ID.CONCIERGE,
         onPress: (closePopover, {reportID, reportAction}) => {
             if (closePopover) {
                 hideContextMenu(false, () => Navigation.navigate(ROUTES.getFlagCommentRoute(reportID, reportAction.reportActionID)));
diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
index f69ac83a89ff..1743ff36aa10 100644
--- a/src/pages/tasks/NewTaskPage.js
+++ b/src/pages/tasks/NewTaskPage.js
@@ -49,11 +49,6 @@ const propTypes = {
         }),
     ),
 
-    /** Current user session */
-    session: PropTypes.shape({
-        email: PropTypes.string.isRequired,
-    }),
-
     /** All reports shared with the user */
     reports: PropTypes.objectOf(reportPropTypes),
 
@@ -65,7 +60,6 @@ const defaultProps = {
     task: {},
     personalDetails: {},
     reports: {},
-    session: {},
 };
 
 function NewTaskPage(props) {
@@ -125,8 +119,6 @@ function NewTaskPage(props) {
         }
 
         TaskUtils.createTaskAndNavigate(
-            props.session.email,
-            props.session.accountID,
             parentReport.reportID,
             props.task.title,
             props.task.description,
@@ -217,9 +209,6 @@ export default compose(
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
     }),
     withLocalize,
 )(NewTaskPage);
diff --git a/tests/actions/IOUTest.js b/tests/actions/IOUTest.js
index 112377f373d5..b9e30d1b0831 100644
--- a/tests/actions/IOUTest.js
+++ b/tests/actions/IOUTest.js
@@ -372,7 +372,6 @@ describe('actions/IOU', () => {
             const iouAction = {
                 reportActionID: NumberUtils.rand64(),
                 actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
-                actorEmail: RORY_EMAIL,
                 actorAccountID: RORY_ACCOUNT_ID,
                 created: DateUtils.getDBTime(),
                 originalMessage: {
@@ -835,7 +834,6 @@ describe('actions/IOU', () => {
             const julesExistingIOUAction = {
                 reportActionID: NumberUtils.rand64(),
                 actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
-                actorEmail: RORY_EMAIL,
                 actorAccountID: RORY_ACCOUNT_ID,
                 created: DateUtils.getDBTime(),
                 originalMessage: {
diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js
index 5ebffff507b8..5566c66df4b7 100644
--- a/tests/actions/ReportTest.js
+++ b/tests/actions/ReportTest.js
@@ -47,7 +47,6 @@ describe('actions/Report', () => {
         const REPORT_ACTION = {
             actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
             actorAccountID: TEST_USER_ACCOUNT_ID,
-            actorEmail: TEST_USER_LOGIN,
             automatic: false,
             avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
             message: [{type: 'COMMENT', html: 'Testing a comment', text: 'Testing a comment'}],
@@ -230,7 +229,6 @@ describe('actions/Report', () => {
                             1: {
                                 actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
                                 actorAccountID: USER_2_ACCOUNT_ID,
-                                actorEmail: USER_2_LOGIN,
                                 automatic: false,
                                 avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
                                 message: [{type: 'COMMENT', html: 'Comment 1', text: 'Comment 1'}],
@@ -316,7 +314,6 @@ describe('actions/Report', () => {
                 const USER_1_BASE_ACTION = {
                     actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
                     actorAccountID: USER_1_ACCOUNT_ID,
-                    actorEmail: USER_1_LOGIN,
                     automatic: false,
                     avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
                     person: [{type: 'TEXT', style: 'strong', text: 'Test User'}],
diff --git a/tests/ui/UnreadIndicatorsTest.js b/tests/ui/UnreadIndicatorsTest.js
index ae19d9db74ae..6ddd5a86e4b2 100644
--- a/tests/ui/UnreadIndicatorsTest.js
+++ b/tests/ui/UnreadIndicatorsTest.js
@@ -176,15 +176,15 @@ function signInAndGetAppWithUnreadChat() {
                         },
                     ],
                 },
-                1: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(10, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '1'),
-                2: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(20, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '2'),
-                3: TestHelper.buildTestReportComment(USER_B_EMAIL, reportAction3CreatedDate, USER_B_ACCOUNT_ID, '3'),
-                4: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(40, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '4'),
-                5: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(50, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '5'),
-                6: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(60, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '6'),
-                7: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(70, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '7'),
-                8: TestHelper.buildTestReportComment(USER_B_EMAIL, MOMENT_TEN_MINUTES_AGO.clone().add(80, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '8'),
-                9: TestHelper.buildTestReportComment(USER_B_EMAIL, reportAction9CreatedDate, USER_B_ACCOUNT_ID, '9'),
+                1: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(10, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '1'),
+                2: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(20, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '2'),
+                3: TestHelper.buildTestReportComment(reportAction3CreatedDate, USER_B_ACCOUNT_ID, '3'),
+                4: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(40, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '4'),
+                5: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(50, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '5'),
+                6: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(60, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '6'),
+                7: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(70, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '7'),
+                8: TestHelper.buildTestReportComment(MOMENT_TEN_MINUTES_AGO.clone().add(80, 'seconds').format(MOMENT_FORMAT), USER_B_ACCOUNT_ID, '8'),
+                9: TestHelper.buildTestReportComment(reportAction9CreatedDate, USER_B_ACCOUNT_ID, '9'),
             });
             Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
                 [USER_B_ACCOUNT_ID]: TestHelper.buildPersonalDetails(USER_B_EMAIL, USER_B_ACCOUNT_ID, 'B'),
@@ -321,7 +321,6 @@ describe('Unread Indicators', () => {
                             },
                             [commentReportActionID]: {
                                 actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
-                                actorEmail: USER_C_EMAIL,
                                 actorAccountID: USER_C_ACCOUNT_ID,
                                 person: [{type: 'TEXT', style: 'strong', text: 'User C'}],
                                 created: NEW_REPORT_FIST_MESSAGE_CREATED_MOMENT.format(MOMENT_FORMAT),
diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index 4f3cf2d61aa6..a8424d14ed33 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -196,17 +196,15 @@ function setPersonalDetails(login, accountID) {
 }
 
 /**
- * @param {String} actorEmail
  * @param {String} created
  * @param {Number} actorAccountID
  * @param {String} actionID
  * @returns {Object}
  */
-function buildTestReportComment(actorEmail, created, actorAccountID, actionID = null) {
+function buildTestReportComment(created, actorAccountID, actionID = null) {
     const reportActionID = actionID || NumberUtils.rand64();
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
-        actorEmail,
         person: [{type: 'TEXT', style: 'strong', text: 'User B'}],
         created,
         message: [{type: 'COMMENT', html: `Comment ${actionID}`, text: `Comment ${actionID}`}],

From 9a030b4fc505c82a7d394f64d1b77d651fd2305f Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 6 Jul 2023 10:51:39 +0300
Subject: [PATCH 47/69] Remove actorEmail in crash-safe way

---
 src/pages/home/report/ReportActionItemSingle.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
index 0fc8b1c72326..3011dff69bf1 100644
--- a/src/pages/home/report/ReportActionItemSingle.js
+++ b/src/pages/home/report/ReportActionItemSingle.js
@@ -73,8 +73,8 @@ const showWorkspaceDetails = (reportID) => {
 function ReportActionItemSingle(props) {
     const actorAccountID = props.action.actorAccountID;
     let {displayName} = props.personalDetailsList[actorAccountID] || {};
-    const {avatar, pendingFields} = props.personalDetailsList[actorAccountID] || {};
-    let actorHint = lodashGet(props.action, 'actorEmail', '').replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
+    const {avatar, login, pendingFields} = props.personalDetailsList[actorAccountID] || {};
+    let actorHint = (login || displayName || '').replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
     const isWorkspaceActor = ReportUtils.isPolicyExpenseChat(props.report) && !actorAccountID;
     let avatarSource = UserUtils.getAvatar(avatar, actorAccountID);
 

From 66e8a526d5fc90056f7fa0583c3d70222a8f1d38 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 6 Jul 2023 10:51:59 +0300
Subject: [PATCH 48/69] Prettify!

---
 src/pages/tasks/NewTaskPage.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
index 1743ff36aa10..9d3ea9a9ac04 100644
--- a/src/pages/tasks/NewTaskPage.js
+++ b/src/pages/tasks/NewTaskPage.js
@@ -118,13 +118,7 @@ function NewTaskPage(props) {
             return;
         }
 
-        TaskUtils.createTaskAndNavigate(
-            parentReport.reportID,
-            props.task.title,
-            props.task.description,
-            props.task.assignee,
-            props.task.assigneeAccountID,
-        );
+        TaskUtils.createTaskAndNavigate(parentReport.reportID, props.task.title, props.task.description, props.task.assignee, props.task.assigneeAccountID);
     }
 
     if (!Permissions.canUseTasks(props.betas)) {

From b0cb46a0c790145e6ea5f39ddd2aeb5844189d30 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 6 Jul 2023 11:02:12 +0300
Subject: [PATCH 49/69] Remove actorEmail and cleanup comment

---
 src/libs/ReportUtils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 145b080e6c81..9bd942e65b85 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1807,7 +1807,6 @@ function buildOptimisticTaskReport(ownerEmail, ownerAccountID, assigneeAccountID
         description,
         ownerEmail,
         ownerAccountID,
-        // managerEmail: assignee,
         managerID: assigneeAccountID,
         type: CONST.REPORT.TYPE.TASK,
         parentReportID,
@@ -2130,7 +2129,7 @@ function shouldShowFlagComment(reportAction, report) {
         !isArchivedRoom(report) &&
         !chatIncludesChronos(report) &&
         !isConciergeChatReport(report.reportID) &&
-        reportAction.actorEmail !== CONST.EMAIL.CONCIERGE
+        reportAction.actorAccountID !== CONST.ACCOUNT_ID.CONCIERGE
     );
 }
 

From af94a830ef1988d244b3d6b38d06b74f7ad65191 Mon Sep 17 00:00:00 2001
From: Eric Han <hanyl_fight@126.com>
Date: Wed, 5 Jul 2023 23:34:55 +0800
Subject: [PATCH 50/69] fix: unwanted linebreaks added when translating html
 blockquote to markdown

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4bbbf3d717d9..ad2c9c3f44c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,7 @@
         "babel-polyfill": "^6.26.0",
         "dom-serializer": "^0.2.2",
         "domhandler": "^4.3.0",
-        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#06a5ff5b0e2f24fe535754eb6b85cec86d157ab2",
+        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#d636fef3f22b4e5fcf61333ddc89a5d2e08cacc9",
         "fbjs": "^3.0.2",
         "htmlparser2": "^7.2.0",
         "jest-when": "^3.5.2",
@@ -24366,8 +24366,8 @@
     },
     "node_modules/expensify-common": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#06a5ff5b0e2f24fe535754eb6b85cec86d157ab2",
-      "integrity": "sha512-TkdanYcxpntK2jSAUfXu1cNhaQeo5rdPlh+uCc9teWe7+QzWqb5yl6drtnD79TcqDkck1MxS7MBShzhXzvuR/g==",
+      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#d636fef3f22b4e5fcf61333ddc89a5d2e08cacc9",
+      "integrity": "sha512-eQIhPJ/6KJX9n2C8HaMsOcAHBClshshDbGyUD0ii7NsjotVNiTeUXtCdOrPlpFDOknCGrF0DrF2D3EPSkbs9jg==",
       "license": "MIT",
       "dependencies": {
         "classnames": "2.3.1",
@@ -60148,9 +60148,9 @@
       }
     },
     "expensify-common": {
-      "version": "git+ssh://git@github.com/Expensify/expensify-common.git#06a5ff5b0e2f24fe535754eb6b85cec86d157ab2",
-      "integrity": "sha512-TkdanYcxpntK2jSAUfXu1cNhaQeo5rdPlh+uCc9teWe7+QzWqb5yl6drtnD79TcqDkck1MxS7MBShzhXzvuR/g==",
-      "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#06a5ff5b0e2f24fe535754eb6b85cec86d157ab2",
+      "version": "git+ssh://git@github.com/Expensify/expensify-common.git#d636fef3f22b4e5fcf61333ddc89a5d2e08cacc9",
+      "integrity": "sha512-eQIhPJ/6KJX9n2C8HaMsOcAHBClshshDbGyUD0ii7NsjotVNiTeUXtCdOrPlpFDOknCGrF0DrF2D3EPSkbs9jg==",
+      "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#d636fef3f22b4e5fcf61333ddc89a5d2e08cacc9",
       "requires": {
         "classnames": "2.3.1",
         "clipboard": "2.0.4",
diff --git a/package.json b/package.json
index 3705d801b1b3..1b779877c160 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "babel-polyfill": "^6.26.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#06a5ff5b0e2f24fe535754eb6b85cec86d157ab2",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#d636fef3f22b4e5fcf61333ddc89a5d2e08cacc9",
     "fbjs": "^3.0.2",
     "htmlparser2": "^7.2.0",
     "jest-when": "^3.5.2",

From 2ce65e33faea0b058d894bc8b8282d97c64f8fd4 Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Thu, 6 Jul 2023 11:05:11 +0200
Subject: [PATCH 51/69] Add Scan receipts Beta

---
 src/CONST.js            | 1 +
 src/libs/Permissions.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/CONST.js b/src/CONST.js
index 7dbcb9dad56d..f13d2009e2bc 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -269,6 +269,7 @@ const CONST = {
         PASSWORDLESS: 'passwordless',
         TASKS: 'tasks',
         THREADS: 'threads',
+        SCAN_RECEIPTS: 'scanReceipts',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index acd21b3da1a2..3617900109f2 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -102,6 +102,14 @@ function canUseTasks(betas) {
     return _.contains(betas, CONST.BETAS.TASKS) || canUseAllBetas(betas);
 }
 
+/**
+ * @param {Array<String>} betas
+ * @returns {Boolean}
+ */
+function canUseScanReceipts(betas) {
+    return _.contains(betas, CONST.BETAS.SCAN_RECEIPTS) || canUseAllBetas(betas);
+}
+
 export default {
     canUseChronos,
     canUseIOU,
@@ -114,4 +122,5 @@ export default {
     canUsePolicyExpenseChat,
     canUsePasswordlessLogins,
     canUseTasks,
+    canUseScanReceipts,
 };

From 343a43ca1909568349bd7eafaa2b86e6911f8723 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Thu, 6 Jul 2023 11:05:01 +0100
Subject: [PATCH 52/69] remove wraping all functions in useCallback, and remove
 openReportIfNecessary from useEffect deps

---
 src/pages/home/report/ReportActionsView.js | 40 ++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 6fe680edf1bb..564342bf3d25 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -1,4 +1,4 @@
-import React, {useRef, useState, useEffect, useContext, useCallback, useMemo} from 'react';
+import React, {useRef, useState, useEffect, useContext, useMemo} from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
@@ -86,14 +86,14 @@ function ReportActionsView(props) {
      */
     const isReportFullyVisible = useMemo(() => getIsReportFullyVisible(props.isFocused), [props.isFocused]);
 
-    const openReportIfNecessary = useCallback(() => {
+    const openReportIfNecessary = () => {
         // If the report is optimistic (AKA not yet created) we don't need to call openReport again
         if (props.report.isOptimisticReport) {
             return;
         }
 
         Report.openReport(props.report.reportID);
-    }, [props.report]);
+    };
 
     useEffect(() => {
         unsubscribeVisibilityListener.current = Visibility.onVisibilityChange(() => {
@@ -169,7 +169,8 @@ function ReportActionsView(props) {
         }
         // update ref with current network state
         prevNetworkRef.current = props.network;
-    }, [props.network, props.report, isReportFullyVisible, openReportIfNecessary]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [props.network, props.report, isReportFullyVisible]);
 
     useEffect(() => {
         const prevIsSmallScreenWidth = prevIsSmallScreenWidthRef.current;
@@ -183,7 +184,8 @@ function ReportActionsView(props) {
         }
         // update ref with current state
         prevIsSmallScreenWidthRef.current = props.isSmallScreenWidth;
-    }, [props.isSmallScreenWidth, props.report, props.reportActions, isReportFullyVisible, openReportIfNecessary]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [props.isSmallScreenWidth, props.report, props.reportActions, isReportFullyVisible]);
 
     useEffect(() => {
         const prevReportActions = prevReportActionsRef.current;
@@ -242,7 +244,7 @@ function ReportActionsView(props) {
      * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
      * displaying.
      */
-    const loadMoreChats = useCallback(() => {
+    const loadMoreChats = () => {
         // Only fetch more if we are not already fetching so that we don't initiate duplicate requests.
         if (props.report.isLoadingMoreReportActions) {
             return;
@@ -257,17 +259,17 @@ function ReportActionsView(props) {
 
         // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
         Report.readOldestAction(props.report.reportID, oldestReportAction.reportActionID);
-    }, [props.report, props.reportActions]);
+    };
 
-    const scrollToBottomAndMarkReportAsRead = useCallback(() => {
+    const scrollToBottomAndMarkReportAsRead = () => {
         reportScrollManager.scrollToBottom();
         Report.readNewestAction(props.report.reportID);
-    }, [reportScrollManager, props.report]);
+    };
 
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.
      */
-    const toggleFloatingMessageCounter = useCallback(() => {
+    const toggleFloatingMessageCounter = () => {
         if (currentScrollOffset.current < -200 && !isFloatingMessageCounterVisible) {
             setIsFloatingMessageCounterVisible(true);
         }
@@ -275,25 +277,21 @@ function ReportActionsView(props) {
         if (currentScrollOffset.current > -200 && isFloatingMessageCounterVisible) {
             setIsFloatingMessageCounterVisible(false);
         }
-    }, [currentScrollOffset, isFloatingMessageCounterVisible]);
+    };
 
     /**
      * keeps track of the Scroll offset of the main messages list
      *
      * @param {Object} {nativeEvent}
      */
-    const trackScroll = useCallback(
-        ({nativeEvent}) => {
-            currentScrollOffset.current = -nativeEvent.contentOffset.y;
-            toggleFloatingMessageCounter();
-        },
-        [currentScrollOffset, toggleFloatingMessageCounter],
-    );
-
+    const trackScroll = ({nativeEvent}) => {
+        currentScrollOffset.current = -nativeEvent.contentOffset.y;
+        toggleFloatingMessageCounter();
+    };
     /**
      * Runs when the FlatList finishes laying out
      */
-    const recordTimeToMeasureItemLayout = useCallback(() => {
+    const recordTimeToMeasureItemLayout = () => {
         if (didLayout.current) {
             return;
         }
@@ -308,7 +306,7 @@ function ReportActionsView(props) {
         } else {
             Performance.markEnd(CONST.TIMING.SWITCH_REPORT);
         }
-    }, [didLayout, hasCachedActions]);
+    };
 
     // Comments have not loaded at all yet do nothing
     if (!_.size(props.reportActions)) {

From 910780cca2517fb7737282b4e64e7a6687e0d82f Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Thu, 6 Jul 2023 17:27:47 +0700
Subject: [PATCH 53/69] Rename method as feedback

---
 src/libs/ErrorUtils.js                                        | 4 ++--
 .../Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/ErrorUtils.js b/src/libs/ErrorUtils.js
index 81899cb7c849..95bbad5f5409 100644
--- a/src/libs/ErrorUtils.js
+++ b/src/libs/ErrorUtils.js
@@ -94,7 +94,7 @@ function getLatestErrorField(onyxData, fieldName) {
  * @param {String} fieldName
  * @returns {Object}
  */
-function getFirstErrorField(onyxData, fieldName) {
+function getEarliestErrorField(onyxData, fieldName) {
     const errorsForField = lodashGet(onyxData, ['errorFields', fieldName], {});
 
     if (_.isEmpty(errorsForField)) {
@@ -132,4 +132,4 @@ function addErrorMessage(errors, inputID, message) {
     }
 }
 
-export {getAuthenticateErrorMessage, getMicroSecondOnyxError, getLatestErrorMessage, getLatestErrorField, getFirstErrorField, addErrorMessage};
+export {getAuthenticateErrorMessage, getMicroSecondOnyxError, getLatestErrorMessage, getLatestErrorField, getEarliestErrorField, addErrorMessage};
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 57a195b53db8..a24b7036bd48 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -165,7 +165,7 @@ function BaseValidateCodeForm(props) {
             </OfflineWithFeedback>
             <OfflineWithFeedback
                 pendingAction={lodashGet(loginData, 'pendingFields.validateLogin', null)}
-                errors={ErrorUtils.getFirstErrorField(loginData, 'validateLogin')}
+                errors={ErrorUtils.getEarliestErrorField(loginData, 'validateLogin')}
                 errorRowStyles={[styles.mt2]}
                 onClose={() => User.clearContactMethodErrors(props.contactMethod, 'validateLogin')}
             >

From 87ca096da7a11651e29ba48c881d15fb6663576e Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 6 Jul 2023 16:23:15 +0300
Subject: [PATCH 54/69] Get personal displayName if no login in personalDetails

---
 src/components/ReportActionItem/TaskPreview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index 396fbef3c2de..621f3b90cbc3 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -66,7 +66,7 @@ function TaskPreview(props) {
         : props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED;
     const taskTitle = props.taskReport.reportName || props.action.childReportName;
     const taskAssigneeAccountID = TaskUtils.getTaskAssigneeAccountID(props.taskReport);
-    const taskAssignee = lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'login'], '');
+    const taskAssignee = lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'login'], lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'displayName'], ''));
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
 
     return (

From 4d04ce583e0906985efa48ab7f98cce8d694c921 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Thu, 6 Jul 2023 15:16:34 +0100
Subject: [PATCH 55/69] Fix bank account menu item showing up as disabled

---
 src/pages/ReimbursementAccount/EnableStep.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index 977f5f3bdfdf..259aa8e89024 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -80,7 +80,6 @@ function EnableStep(props) {
                             icon={icon}
                             iconWidth={iconSize}
                             iconHeight={iconSize}
-                            disabled
                             interactive={false}
                             wrapperStyle={[styles.cardMenuItem, styles.mv3]}
                         />

From 0ca79488eb7b385f9c58b63d41e687bf3b26e54b Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jul 2023 14:20:46 +0000
Subject: [PATCH 56/69] Update version to 1.3.37-3

---
 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 32147ca19413..3be79d5b4d84 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 1001033702
-        versionName "1.3.37-2"
+        versionCode 1001033703
+        versionName "1.3.37-3"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 48dfcf1c0ba4..3e372eb32e54 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.37.2</string>
+	<string>1.3.37.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 826a53d2d485..03034b1792e8 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.37.2</string>
+	<string>1.3.37.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 4bbbf3d717d9..f251d277a3e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-2",
+  "version": "1.3.37-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.37-2",
+      "version": "1.3.37-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 3705d801b1b3..7e7bab81e1d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-2",
+  "version": "1.3.37-3",
   "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 3f29349815955b3fe044a77d12342347b6153d90 Mon Sep 17 00:00:00 2001
From: Andrew Li <andrewli@expensify.com>
Date: Thu, 6 Jul 2023 11:43:21 -0400
Subject: [PATCH 57/69] Hide only chat threads that haven't been commented on

---
 src/libs/ReportUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 1631b71d6049..83a3d7e7b707 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -2018,8 +2018,8 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, iouRep
         return false;
     }
 
-    // Hide thread reports that haven't been commented on
-    if (isThread(report) && !report.lastMessageText) {
+    // Hide only chat threads that haven't been commented on (other threads are actionable)
+    if (isChatThread(report) && !report.lastMessageText) {
         return false;
     }
 

From 20203aa3b72dc3091c38e72fa19848ee1495c56d Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Thu, 6 Jul 2023 22:49:45 +0700
Subject: [PATCH 58/69] resolve comments

---
 src/components/TaskHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js
index e7d1252cb27b..a1430fc682a6 100644
--- a/src/components/TaskHeader.js
+++ b/src/components/TaskHeader.js
@@ -38,7 +38,7 @@ const propTypes = {
         accountID: PropTypes.number,
     }),
 
-    /** Whether Button is on active screen */
+    /** Whether the screen is focused */
     isFocused: PropTypes.bool.isRequired,
 
     ...withLocalizePropTypes,

From 3f85450edb978a26fb0ce07f0135959dcb506a13 Mon Sep 17 00:00:00 2001
From: Jakub Trzebiatowski <cubuspl42@gmail.com>
Date: Thu, 6 Jul 2023 18:31:19 +0200
Subject: [PATCH 59/69] UserDetailsTooltip: Use local variables

---
 src/components/UserDetailsTooltip/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UserDetailsTooltip/index.js b/src/components/UserDetailsTooltip/index.js
index 34383b5d716c..a13728fb1074 100644
--- a/src/components/UserDetailsTooltip/index.js
+++ b/src/components/UserDetailsTooltip/index.js
@@ -59,7 +59,7 @@ function UserDetailsTooltip(props) {
     return (
         <Tooltip
             renderTooltipContent={renderTooltipContent}
-            renderTooltipContentKey={[userDetails.displayName, userDetails.login]}
+            renderTooltipContentKey={[userDisplayName, userLogin]}
         >
             {props.children}
         </Tooltip>

From e1ca0502d1cc783a29c626f38c1a3bfe2d6c7199 Mon Sep 17 00:00:00 2001
From: Nikhil Vats <nikvats5499@gmail.com>
Date: Thu, 6 Jul 2023 23:00:07 +0530
Subject: [PATCH 60/69] Fix eye icon bug

---
 src/components/TextInput/BaseTextInput.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index c9c61207f81e..ef7654611ccc 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -218,7 +218,7 @@ function BaseTextInput(props) {
     };
 
     const togglePasswordVisibility = useCallback(() => {
-        setPasswordHidden((prevState) => !prevState.passwordHidden);
+        setPasswordHidden((prevPasswordHidden) => !prevPasswordHidden);
     }, []);
 
     const storePrefixLayoutDimensions = useCallback((event) => {
@@ -347,7 +347,7 @@ function BaseTextInput(props) {
                             />
                             {Boolean(props.secureTextEntry) && (
                                 <Checkbox
-                                    style={styles.textInputIconContainer}
+                                    style={[styles.flex1, styles.textInputIconContainer]}
                                     onPress={togglePasswordVisibility}
                                     onMouseDown={(e) => e.preventDefault()}
                                     accessibilityLabel={props.translate('common.visible')}

From 5364229aed4a7c126337376781b806c3bd58357a Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 6 Jul 2023 12:39:23 -0500
Subject: [PATCH 61/69] Do not use the replace in case of RHP as its fixing
 edge case

---
 src/libs/Navigation/linkTo.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/Navigation/linkTo.js b/src/libs/Navigation/linkTo.js
index c86c15c38146..4b8a0c90bd6f 100644
--- a/src/libs/Navigation/linkTo.js
+++ b/src/libs/Navigation/linkTo.js
@@ -79,12 +79,8 @@ export default function linkTo(navigation, path, type) {
     }
 
     if (action.payload.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-        const {minimalAction, targetName} = getMinimalAction(action, navigation.getRootState());
+        const {minimalAction} = getMinimalAction(action, navigation.getRootState());
         if (minimalAction) {
-            // If the target name is RHP that means this action is responsible for changing flow within the RHP e.g. from settings to search. In that case we want to use REPLACE.
-            if (targetName === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-                minimalAction.type = 'REPLACE';
-            }
             root.dispatch(minimalAction);
             return;
         }

From c9e9964be649e36ab464616f414822b6854a1b31 Mon Sep 17 00:00:00 2001
From: situchan <Situchandrashil7@gmail.com>
Date: Thu, 6 Jul 2023 19:12:03 +0100
Subject: [PATCH 62/69] fix crash on whisper thread after remove member

---
 src/libs/ReportUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 16fd84e31ad6..1fb70808399a 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -474,7 +474,7 @@ function isArchivedRoom(report) {
  */
 function getPolicyName(report, returnEmptyIfNotFound = false) {
     const noPolicyFound = returnEmptyIfNotFound ? '' : Localize.translateLocal('workspace.common.unavailable');
-    if (report === undefined) {
+    if (_.isEmpty(report)) {
         return noPolicyFound;
     }
 

From 29caf708887752310a796c66d76db6656c8ee951 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jul 2023 18:37:05 +0000
Subject: [PATCH 63/69] Update version to 1.3.37-4

---
 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 3be79d5b4d84..30e27a397b09 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 1001033703
-        versionName "1.3.37-3"
+        versionCode 1001033704
+        versionName "1.3.37-4"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3e372eb32e54..6ae4c18fcde8 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.37.3</string>
+	<string>1.3.37.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 03034b1792e8..35b0b5df6999 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.37.3</string>
+	<string>1.3.37.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 18cd38be91a7..2bbd6a23cb85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-3",
+  "version": "1.3.37-4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.37-3",
+      "version": "1.3.37-4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index b55bb95fa779..edeaca2c0fb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-3",
+  "version": "1.3.37-4",
   "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 e41243a1da0e424b7080c3bcf505b51feb68ccad Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 6 Jul 2023 14:11:43 -0500
Subject: [PATCH 64/69] Refactor the getMinimalAction as we dont need
 targetName anymore

---
 .../AppNavigator/Navigators/RightModalNavigator.js     | 10 +++++++++-
 src/libs/Navigation/AppNavigator/RHPScreenOptions.js   |  2 +-
 src/libs/Navigation/linkTo.js                          |  9 +++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index 7b22475bc623..116e54e6001b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -17,13 +17,21 @@ function RigthModalNavigator() {
                 name="NewChat"
                 component={ModalStackNavigators.NewChatModalStackNavigator}
             />
-            <Stack.Screen
+             <Stack.Screen
                 name="NewGroup"
                 component={ModalStackNavigators.NewGroupModalStackNavigator}
+                options={{
+                    // Disable animation for this screen because it causes an animation glitch when using shortcuts
+                    animationEnabled: false,
+                }}
             />
             <Stack.Screen
                 name="Search"
                 component={ModalStackNavigators.SearchModalStackNavigator}
+                options={{
+                    // Disable animation for this screen because it causes an animation glitch when using shortcuts
+                    animationEnabled: false,
+                }}
             />
             <Stack.Screen
                 name="Details"
diff --git a/src/libs/Navigation/AppNavigator/RHPScreenOptions.js b/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
index 9aa984023f4f..d7448dcf2314 100644
--- a/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
+++ b/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
@@ -3,7 +3,7 @@ import styles from '../../../styles/styles';
 
 const RHPScreenOptions = {
     headerShown: false,
-    animationEnabled: false,
+    animationEnabled: true,
     gestureDirection: 'horizontal',
     cardStyle: styles.navigationScreenCardStyle,
     cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
diff --git a/src/libs/Navigation/linkTo.js b/src/libs/Navigation/linkTo.js
index 4b8a0c90bd6f..c610ae710992 100644
--- a/src/libs/Navigation/linkTo.js
+++ b/src/libs/Navigation/linkTo.js
@@ -10,21 +10,18 @@ import getStateFromPath from './getStateFromPath';
  *
  * @param {Object} action action generated by getActionFromState
  * @param {Object} state The root state
- * @returns {{minimalAction: Object, targetName: String}} minimal action is the action that we should dispatch and targetName is the name of the target navigator.
- * targetName name is necessary to determine if we are going to use REPLACE for navigating between RHP flows.
+ * @returns {Object} minimalAction minimal action is the action that we should dispatch
  */
 function getMinimalAction(action, state) {
     let currentAction = action;
     let currentState = state;
     let currentTargetKey = null;
-    let targetName = null;
 
     while (currentState.routes[currentState.index].name === currentAction.payload.name) {
         if (!currentState.routes[currentState.index].state) {
             break;
         }
 
-        targetName = currentState.routes[currentState.index].name;
         currentState = currentState.routes[currentState.index].state;
 
         currentTargetKey = currentState.key;
@@ -40,7 +37,7 @@ function getMinimalAction(action, state) {
             target: currentTargetKey,
         };
     }
-    return {minimalAction: currentAction, targetName};
+    return currentAction;
 }
 
 export default function linkTo(navigation, path, type) {
@@ -79,7 +76,7 @@ export default function linkTo(navigation, path, type) {
     }
 
     if (action.payload.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-        const {minimalAction} = getMinimalAction(action, navigation.getRootState());
+        const minimalAction = getMinimalAction(action, navigation.getRootState());
         if (minimalAction) {
             root.dispatch(minimalAction);
             return;

From d98a02a5d227c4503e3e3d05c7a3029431d51145 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jul 2023 19:16:43 +0000
Subject: [PATCH 65/69] Update version to 1.3.37-5

---
 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 30e27a397b09..8619f4e40c5f 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 1001033704
-        versionName "1.3.37-4"
+        versionCode 1001033705
+        versionName "1.3.37-5"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 6ae4c18fcde8..3ee9a4061115 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.37.4</string>
+	<string>1.3.37.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 35b0b5df6999..52dbce012e16 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.37.4</string>
+	<string>1.3.37.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2bbd6a23cb85..d879ea8e52f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-4",
+  "version": "1.3.37-5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.37-4",
+      "version": "1.3.37-5",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index edeaca2c0fb3..96b0e167797b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-4",
+  "version": "1.3.37-5",
   "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 97f2539c649c9432cc8ddf8a6091789662c445c6 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 6 Jul 2023 14:26:46 -0500
Subject: [PATCH 66/69] Fix linter

---
 .../Navigation/AppNavigator/Navigators/RightModalNavigator.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index 116e54e6001b..a04e9bfc10ec 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -17,7 +17,7 @@ function RigthModalNavigator() {
                 name="NewChat"
                 component={ModalStackNavigators.NewChatModalStackNavigator}
             />
-             <Stack.Screen
+            <Stack.Screen
                 name="NewGroup"
                 component={ModalStackNavigators.NewGroupModalStackNavigator}
                 options={{

From 2ca339edb9bb723d2f2bd0081932383d4c8e041c Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Thu, 6 Jul 2023 20:01:10 +0100
Subject: [PATCH 67/69] adding back unsubscribeVisibilityListener in useEffect
 hook

---
 src/pages/home/report/ReportActionsView.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 564342bf3d25..4ca11ae543de 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -107,6 +107,12 @@ function ReportActionsView(props) {
                 setNewMarkerReportActionID('');
             }
         });
+        return () => {
+            if (!unsubscribeVisibilityListener.current) {
+                return;
+            }
+            unsubscribeVisibilityListener.current();
+        };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 

From 07afdd4c01c74db68d643315b54f5766e7023690 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jul 2023 20:57:52 +0000
Subject: [PATCH 68/69] Update version to 1.3.37-6

---
 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 8619f4e40c5f..560f53ab42d4 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 1001033705
-        versionName "1.3.37-5"
+        versionCode 1001033706
+        versionName "1.3.37-6"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3ee9a4061115..ade32be7b401 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.37.5</string>
+	<string>1.3.37.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 52dbce012e16..c23c222d7283 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.37.5</string>
+	<string>1.3.37.6</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index d879ea8e52f9..621ba96cd383 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-5",
+  "version": "1.3.37-6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.37-5",
+      "version": "1.3.37-6",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 96b0e167797b..148578aeebaa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.37-5",
+  "version": "1.3.37-6",
   "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 8a468b505bcec44da6a92f9b82e12f33eba7485f Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Thu, 6 Jul 2023 15:08:26 -0700
Subject: [PATCH 69/69] Fix participant optimistic data when creating
 non-restricted room

---
 src/libs/actions/Report.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index e7e1a82100aa..f33056cdaed0 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1200,8 +1200,9 @@ function navigateToConciergeChat() {
  * @param {Array} policyMembers
  */
 function addPolicyReport(policyID, reportName, visibility, policyMembers) {
-    // The participants include the current user (admin) and the employees. Participants must not be empty.
-    const participants = _.unique([currentUserAccountID, ...policyMembers]);
+    // The participants include the current user (admin), and for restricted rooms, the policy members. Participants must not be empty.
+    const members = visibility === CONST.REPORT.VISIBILITY.RESTRICTED ? policyMembers : [];
+    const participants = _.unique([currentUserAccountID, ...members]);
     const policyReport = ReportUtils.buildOptimisticChatReport(
         participants,
         reportName,