From 6a894412d2b21dc2e1353a41444bfe1eb94eeb56 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Sat, 17 Jun 2023 23:50:57 +0700
Subject: [PATCH 1/2] Fix console error invalid prop in native

---
 .../Pressable/GenericPressable/BaseGenericPressable.js       | 3 ++-
 src/components/ReportActionItem/MoneyRequestAction.js        | 3 ++-
 src/components/ReportActionItem/ReportPreview.js             | 5 +++--
 src/components/TextInput/BaseTextInput.js                    | 3 ++-
 src/pages/settings/Payments/AddPayPalMePage.js               | 3 ++-
 src/styles/styles.js                                         | 4 ----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
index 066e14989930..44fdca70aded 100644
--- a/src/components/Pressable/GenericPressable/BaseGenericPressable.js
+++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
@@ -5,6 +5,7 @@ import Accessibility from '../../../libs/Accessibility';
 import HapticFeedback from '../../../libs/HapticFeedback';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
 import styles from '../../../styles/styles';
+import cursor from '../../../styles/utilities/cursor';
 import genericPressablePropTypes from './PropTypes';
 import CONST from '../../../CONST';
 import * as StyleUtils from '../../../styles/StyleUtils';
@@ -24,7 +25,7 @@ const getCursorStyle = (isDisabled, isText) => {
         return styles.cursorText;
     }
 
-    return styles.cursorPointer;
+    return cursor.cursorPointer;
 };
 
 const GenericPressable = forwardRef((props, ref) => {
diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js
index 8bef184bab08..50c88401721b 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.js
+++ b/src/components/ReportActionItem/MoneyRequestAction.js
@@ -14,6 +14,7 @@ import IOUPreview from './IOUPreview';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import styles from '../../styles/styles';
+import cursor from '../../styles/utilities/cursor';
 import * as IOUUtils from '../../libs/IOUUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as Report from '../../libs/actions/Report';
@@ -154,7 +155,7 @@ function MoneyRequestAction(props) {
                 checkIfContextMenuActive={props.checkIfContextMenuActive}
                 shouldShowPendingConversionMessage={shouldShowPendingConversionMessage}
                 onPreviewPressed={onIOUPreviewPressed}
-                containerStyles={[styles.cursorPointer, props.isHovered ? styles.iouPreviewBoxHover : undefined, ...props.style]}
+                containerStyles={[cursor.cursorPointer, props.isHovered ? styles.iouPreviewBoxHover : undefined, ...props.style]}
                 isHovered={props.isHovered}
             />
         </>
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index 7fa9ebcd6745..b73b10f67442 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -8,6 +8,7 @@ import Text from '../Text';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
 import styles from '../../styles/styles';
+import cursor from '../../styles/utilities/cursor';
 import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import compose from '../../libs/compose';
@@ -118,12 +119,12 @@ function ReportPreview(props) {
                 >
                     <View style={[styles.flexShrink1]}>
                         {props.iouReport.hasOutstandingIOU ? (
-                            <Text style={[styles.chatItemMessage, styles.cursorPointer, styles.colorMuted]}>
+                            <Text style={[styles.chatItemMessage, cursor.cursorPointer, styles.colorMuted]}>
                                 {lodashGet(message, 'html', props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount}))}
                             </Text>
                         ) : (
                             <View style={[styles.flexRow]}>
-                                <Text style={[styles.chatItemMessage, styles.cursorPointer, styles.colorMuted]}>
+                                <Text style={[styles.chatItemMessage, cursor.cursorPointer, styles.colorMuted]}>
                                     {lodashGet(message, 'html', props.translate('iou.payerSettled', {amount: reportAmount}))}
                                 </Text>
                                 {!props.iouReport.hasOutstandingIOU && (
diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index 91ab2162674f..00fb9761dc1e 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -7,6 +7,7 @@ import TextInputLabel from './TextInputLabel';
 import * as baseTextInputPropTypes from './baseTextInputPropTypes';
 import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
+import cursor from '../../styles/utilities/cursor';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
 import Text from '../Text';
@@ -354,7 +355,7 @@ class BaseTextInput extends Component {
                                     </Checkbox>
                                 )}
                                 {!this.props.secureTextEntry && Boolean(this.props.icon) && (
-                                    <View style={[styles.textInputIconContainer, isEditable ? styles.cursorPointer : styles.pointerEventsNone]}>
+                                    <View style={[styles.textInputIconContainer, isEditable ? cursor.cursorPointer : styles.pointerEventsNone]}>
                                         <Icon
                                             src={this.props.icon}
                                             fill={themeColors.icon}
diff --git a/src/pages/settings/Payments/AddPayPalMePage.js b/src/pages/settings/Payments/AddPayPalMePage.js
index ec5476a9162e..fe884553d171 100644
--- a/src/pages/settings/Payments/AddPayPalMePage.js
+++ b/src/pages/settings/Payments/AddPayPalMePage.js
@@ -9,6 +9,7 @@ import Text from '../../../components/Text';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import Navigation from '../../../libs/Navigation/Navigation';
 import styles from '../../../styles/styles';
+import cursor from '../../../styles/utilities/cursor';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import Button from '../../../components/Button';
 import FixedFooter from '../../../components/FixedFooter';
@@ -75,7 +76,7 @@ function AddPayPalMePage(props) {
                             accessibilityLabel={props.translate('addPayPalMePage.supportedCurrencies')}
                             onPress={() => Linking.openURL('https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies')}
                         >
-                            <View style={[styles.flexRow, styles.cursorPointer]}>
+                            <View style={[styles.flexRow, cursor.cursorPointer]}>
                                 <TextLink
                                     // eslint-disable-next-line max-len
                                     href="https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies"
diff --git a/src/styles/styles.js b/src/styles/styles.js
index c42c1a77c07f..28bc879063fd 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -2680,10 +2680,6 @@ const styles = {
         outline: 'none',
     },
 
-    cursorPointer: {
-        cursor: 'pointer',
-    },
-
     cardStyleNavigator: {
         overflow: 'hidden',
         height: '100%',

From 1aa11442b5e5ee76cfa7aa8689570e89077d13c5 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 19 Jun 2023 21:57:10 +0700
Subject: [PATCH 2/2] remove import cursor

---
 .../Pressable/GenericPressable/BaseGenericPressable.js       | 3 +--
 src/components/ReportActionItem/MoneyRequestAction.js        | 3 +--
 src/components/ReportActionItem/ReportPreview.js             | 5 ++---
 src/components/TextInput/BaseTextInput.js                    | 3 +--
 src/pages/settings/Payments/AddPayPalMePage.js               | 3 +--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
index 44fdca70aded..066e14989930 100644
--- a/src/components/Pressable/GenericPressable/BaseGenericPressable.js
+++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
@@ -5,7 +5,6 @@ import Accessibility from '../../../libs/Accessibility';
 import HapticFeedback from '../../../libs/HapticFeedback';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
 import styles from '../../../styles/styles';
-import cursor from '../../../styles/utilities/cursor';
 import genericPressablePropTypes from './PropTypes';
 import CONST from '../../../CONST';
 import * as StyleUtils from '../../../styles/StyleUtils';
@@ -25,7 +24,7 @@ const getCursorStyle = (isDisabled, isText) => {
         return styles.cursorText;
     }
 
-    return cursor.cursorPointer;
+    return styles.cursorPointer;
 };
 
 const GenericPressable = forwardRef((props, ref) => {
diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js
index 50c88401721b..8bef184bab08 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.js
+++ b/src/components/ReportActionItem/MoneyRequestAction.js
@@ -14,7 +14,6 @@ import IOUPreview from './IOUPreview';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import styles from '../../styles/styles';
-import cursor from '../../styles/utilities/cursor';
 import * as IOUUtils from '../../libs/IOUUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as Report from '../../libs/actions/Report';
@@ -155,7 +154,7 @@ function MoneyRequestAction(props) {
                 checkIfContextMenuActive={props.checkIfContextMenuActive}
                 shouldShowPendingConversionMessage={shouldShowPendingConversionMessage}
                 onPreviewPressed={onIOUPreviewPressed}
-                containerStyles={[cursor.cursorPointer, props.isHovered ? styles.iouPreviewBoxHover : undefined, ...props.style]}
+                containerStyles={[styles.cursorPointer, props.isHovered ? styles.iouPreviewBoxHover : undefined, ...props.style]}
                 isHovered={props.isHovered}
             />
         </>
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index b73b10f67442..7fa9ebcd6745 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -8,7 +8,6 @@ import Text from '../Text';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
 import styles from '../../styles/styles';
-import cursor from '../../styles/utilities/cursor';
 import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import compose from '../../libs/compose';
@@ -119,12 +118,12 @@ function ReportPreview(props) {
                 >
                     <View style={[styles.flexShrink1]}>
                         {props.iouReport.hasOutstandingIOU ? (
-                            <Text style={[styles.chatItemMessage, cursor.cursorPointer, styles.colorMuted]}>
+                            <Text style={[styles.chatItemMessage, styles.cursorPointer, styles.colorMuted]}>
                                 {lodashGet(message, 'html', props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount}))}
                             </Text>
                         ) : (
                             <View style={[styles.flexRow]}>
-                                <Text style={[styles.chatItemMessage, cursor.cursorPointer, styles.colorMuted]}>
+                                <Text style={[styles.chatItemMessage, styles.cursorPointer, styles.colorMuted]}>
                                     {lodashGet(message, 'html', props.translate('iou.payerSettled', {amount: reportAmount}))}
                                 </Text>
                                 {!props.iouReport.hasOutstandingIOU && (
diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index 00fb9761dc1e..91ab2162674f 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -7,7 +7,6 @@ import TextInputLabel from './TextInputLabel';
 import * as baseTextInputPropTypes from './baseTextInputPropTypes';
 import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
-import cursor from '../../styles/utilities/cursor';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
 import Text from '../Text';
@@ -355,7 +354,7 @@ class BaseTextInput extends Component {
                                     </Checkbox>
                                 )}
                                 {!this.props.secureTextEntry && Boolean(this.props.icon) && (
-                                    <View style={[styles.textInputIconContainer, isEditable ? cursor.cursorPointer : styles.pointerEventsNone]}>
+                                    <View style={[styles.textInputIconContainer, isEditable ? styles.cursorPointer : styles.pointerEventsNone]}>
                                         <Icon
                                             src={this.props.icon}
                                             fill={themeColors.icon}
diff --git a/src/pages/settings/Payments/AddPayPalMePage.js b/src/pages/settings/Payments/AddPayPalMePage.js
index fe884553d171..ec5476a9162e 100644
--- a/src/pages/settings/Payments/AddPayPalMePage.js
+++ b/src/pages/settings/Payments/AddPayPalMePage.js
@@ -9,7 +9,6 @@ import Text from '../../../components/Text';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import Navigation from '../../../libs/Navigation/Navigation';
 import styles from '../../../styles/styles';
-import cursor from '../../../styles/utilities/cursor';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import Button from '../../../components/Button';
 import FixedFooter from '../../../components/FixedFooter';
@@ -76,7 +75,7 @@ function AddPayPalMePage(props) {
                             accessibilityLabel={props.translate('addPayPalMePage.supportedCurrencies')}
                             onPress={() => Linking.openURL('https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies')}
                         >
-                            <View style={[styles.flexRow, cursor.cursorPointer]}>
+                            <View style={[styles.flexRow, styles.cursorPointer]}>
                                 <TextLink
                                     // eslint-disable-next-line max-len
                                     href="https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies"