rename icon prop to src

Expensify · Jan 24, 2021 · 4a0e4b1 · 4a0e4b1
1 parent 7415d5f
commit 4a0e4b1
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/src/components/CreateMenu.js b/src/components/CreateMenu.js
@@ -50,7 +50,7 @@ const CreateMenu = (props) => {
                     ])}
                 >
                     <View style={styles.createMenuIcon}>
-                        <Icon icon={icon} width={24} height={24} />
+                        <Icon src={icon} width={24} height={24} />
                     </View>
                     <View style={styles.justifyContentCenter}>
                         <Text style={[styles.createMenuText, styles.ml3]}>

diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js
@@ -38,7 +38,7 @@ const HeaderWithCloseButton = props => (
                     onPress={props.onCloseButtonPress}
                     style={[styles.touchableButtonImage]}
                 >
-                    <Icon icon={Close} />
+                    <Icon src={Close} />
                 </TouchableOpacity>
             </View>
         </View>

diff --git a/src/components/Icon/index.js b/src/components/Icon/index.js
@@ -10,7 +10,7 @@ const ICONS = _.extend(BrandAssets, Expensicons);
 
 const propTypes = {
     // The asset to render.
-    icon: PropTypes.oneOf(_.values(ICONS)).isRequired,
+    src: PropTypes.oneOf(_.values(ICONS)).isRequired,
 
     // The width of the icon.
     width: PropTypes.number,
@@ -33,11 +33,11 @@ const defaultProps = {
 // eslint-disable-next-line react/prefer-stateless-function
 class Icon extends PureComponent {
     render() {
-        const IconToRender = this.props.icon;
+        const IconToRender = this.props.src;
 
         // Expensicons have a default fill color, but brand assets do not
         let fillColor = this.props.fill;
-        if (!fillColor && _.contains(_.values(Expensicons), this.props.icon)) {
+        if (!fillColor && _.contains(_.values(Expensicons), this.props.src)) {
             fillColor = themeColors.icon;
         }
 

diff --git a/src/components/PillWithCancelButton.js b/src/components/PillWithCancelButton.js
@@ -21,7 +21,7 @@ const PillWithCancelButton = props => (
         >
             {props.text}
         </Text>
-        <Icon icon={Close} width={12} height={12} />
+        <Icon src={Close} width={12} height={12} />
     </TouchableOpacity>
 );
 

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
@@ -96,7 +96,7 @@ class SetPasswordPage extends Component {
                     <View style={[styles.signInPageInner]}>
                         <View style={[styles.signInPageLogo]}>
                             <Icon
-                                icon={ExpensifyCashLogo}
+                                src={ExpensifyCashLogo}
                                 width={variables.componentSizeLarge}
                                 height={variables.componentSizeLarge}
                             />

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
@@ -45,7 +45,7 @@ const HeaderView = props => (
                     onPress={props.onNavigationMenuButtonClicked}
                     style={[styles.LHNToggle]}
                 >
-                    <Icon icon={BackArrow} />
+                    <Icon src={BackArrow} />
                 </Pressable>
             )}
             {props.report && props.report.reportName ? (
@@ -63,7 +63,7 @@ const HeaderView = props => (
                             onPress={() => togglePinnedState(props.report)}
                             style={[styles.touchableButtonImage, styles.mr0]}
                         >
-                            <Icon icon={Pin} fill={props.report.isPinned ? themeColors.heading : themeColors.icon} />
+                            <Icon src={Pin} fill={props.report.isPinned ? themeColors.heading : themeColors.icon} />
                         </Pressable>
                     </View>
                 </View>

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
@@ -168,7 +168,7 @@ class ReportActionCompose extends React.Component {
                                             style={[styles.chatItemAttachButton]}
                                             underlayColor={themeColors.componentBG}
                                         >
-                                            <Icon icon={Paperclip} />
+                                            <Icon src={Paperclip} />
                                         </TouchableOpacity>
                                     )}
                                 </AttachmentPicker>
@@ -214,7 +214,7 @@ class ReportActionCompose extends React.Component {
                         underlayColor={themeColors.componentBG}
                         disabled={this.state.isCommentEmpty}
                     >
-                        <Icon icon={Send} fill={themeColors.componentBG} />
+                        <Icon src={Send} fill={themeColors.componentBG} />
                     </TouchableOpacity>
                 </View>
                 <ReportTypingIndicator reportID={this.props.reportID} />

diff --git a/src/pages/home/sidebar/ChatLinkRow.js b/src/pages/home/sidebar/ChatLinkRow.js
@@ -118,7 +118,7 @@ const ChatLinkRow = ({
                     </TouchableOpacity>
                 </View>
             )}
-            {option.hasDraftComment && <Icon icon={Pencil} width={16} height={16} />}
+            {option.hasDraftComment && <Icon src={Pencil} width={16} height={16} />}
         </View>
     );
 };

diff --git a/src/pages/home/sidebar/ChatSwitcherSearchForm.js b/src/pages/home/sidebar/ChatSwitcherSearchForm.js
@@ -135,7 +135,7 @@ const ChatSwitcherSearchForm = props => (
             onPress={props.onClearButtonClick}
             underlayColor={themeColors.componentBG}
         >
-            <Icon icon={Close} width={24} height={24} />
+            <Icon src={Close} width={24} height={24} />
         </TouchableOpacity>
     </View>
 );

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
@@ -141,7 +141,7 @@ const SidebarLinks = (props) => {
                         style={[styles.flexRow, styles.sidebarHeaderTop]}
                         onPress={() => ChatSwitcher.show()}
                     >
-                        <Icon icon={MagnifyingGlass} />
+                        <Icon src={MagnifyingGlass} />
                     </TouchableOpacity>
                     <TouchableOpacity
                         onPress={props.onAvatarClick}

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
@@ -19,7 +19,7 @@ const SignInPageLayoutNarrow = ({children}) => (
             <View style={[styles.signInPageInnerNative]}>
                 <View style={[styles.signInPageLogoNative]}>
                     <Icon
-                        icon={ExpensifyCashLogo}
+                        src={ExpensifyCashLogo}
                         width={variables.componentSizeLarge}
                         height={variables.componentSizeLarge}
                     />

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
@@ -29,7 +29,7 @@ const SignInPageLayoutWide = ({children}) => (
             <View style={[styles.flex1, styles.w50]}>
                 <View style={[styles.signInPageLogo, styles.mt6, styles.mb5]}>
                     <Icon
-                        icon={ExpensifyCashLogo}
+                        src={ExpensifyCashLogo}
                         width={variables.componentSizeLarge}
                         height={variables.componentSizeLarge}
                     />
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,7 +118,7 @@ const ChatLinkRow = ({ @@
                         </TouchableOpacity>
                     </View>
                 )}
-                {option.hasDraftComment && <Icon icon={Pencil} width={16} height={16} />}
+                {option.hasDraftComment && <Icon src={Pencil} width={16} height={16} />}
             </View>
         );
     };
@@ Expand Down @@