Fix issues

Expensify · Sep 29, 2022 · 11c2d49 · 11c2d49
1 parent 150cad6
commit 11c2d49
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/CONST.js b/src/CONST.js
@@ -669,6 +669,7 @@ const CONST = {
             FREE: 'free',
             PERSONAL: 'personal',
             CORPORATE: 'corporate',
+            TEAM: 'team',
         },
         ROLE: {
             ADMIN: 'admin',

diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
@@ -111,7 +111,7 @@ const ReportWelcomeText = (props) => {
                     {_.map(displayNamesWithTooltips, ({
                         displayName, pronouns, tooltip,
                     }, index) => (
-                        <Text key={displayName}>
+                        <Text key={`${displayName}${pronouns}${index}`}>
                             <Tooltip text={tooltip}>
                                 <Text style={[styles.textStrong]} onPress={() => Navigation.navigate(ROUTES.getDetailsRoute(participants[index]))}>
                                     {displayName}

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -240,7 +240,7 @@ class ReportScreen extends React.Component {
                         reportActions={this.props.reportActions}
                         report={this.props.report}
                         isComposerFullSize={this.props.isComposerFullSize}
-                        onSubmitComment={this.props.onSubmitComment}
+                        onSubmitComment={this.onSubmitComment}
                     />
                 </View>
             </ScreenWrapper>

diff --git a/src/pages/home/report/ReportFooter.js b/src/pages/home/report/ReportFooter.js
@@ -24,11 +24,14 @@ const propTypes = {
     report: reportPropTypes.isRequired,
 
     /** Report actions for the current report */
-    reportActions: reportActionPropTypes.isRequired,
+    reportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)).isRequired,
 
     /** Offline status */
     isOffline: PropTypes.bool.isRequired,
 
+    /** Callback fired when the comment is submitted */
+    onSubmitComment: PropTypes.func.isRequired,
+
     /** Any errors associated with an attempt to create a workspace room */
     // eslint-disable-next-line react/forbid-prop-types
     addWorkspaceRoomErrors: PropTypes.object,
@@ -45,7 +48,7 @@ const propTypes = {
 const defaultProps = {
     shouldShowComposeInput: true,
     addWorkspaceRoomErrors: {},
-    addWorkspaceRoomPendingAction: '',
+    addWorkspaceRoomPendingAction: null,
 };
 
 class ReportFooter extends React.Component {
@@ -90,7 +93,7 @@ class ReportFooter extends React.Component {
                             >
                                 <ReportActionCompose
                                     onSubmit={this.props.onSubmitComment}
-                                    reportID={this.props.report.reportID}
+                                    reportID={this.props.report.reportID.toString()}
                                     reportActions={this.props.reportActions}
                                     report={this.props.report}
                                     isComposerFullSize={this.props.isComposerFullSize}