Merge pull request #18242 from Prince-Mendiratta/feat/17163-consisten…

…t-dotindicator-size [Icon Size] GBR, RBR & related icon size 20x20
Expensify · May 2, 2023 · cdb0207 · cdb0207
2 parents e704af2 + 7a65ac0
commit cdb0207
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 26 deletions.
diff --git a/src/components/DotIndicatorMessage.js b/src/components/DotIndicatorMessage.js
@@ -6,7 +6,6 @@ import styles from '../styles/styles';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import colors from '../styles/colors';
-import variables from '../styles/variables';
 import Text from './Text';
 
 const propTypes = {
@@ -54,7 +53,7 @@ const DotIndicatorMessage = (props) => {
     return (
         <View style={[styles.dotIndicatorMessage, ...props.style]}>
             <View style={styles.offlineFeedback.errorDot}>
-                <Icon src={Expensicons.DotIndicator} fill={props.type === 'error' ? colors.red : colors.green} height={variables.iconSizeSmall} width={variables.iconSizeSmall} />
+                <Icon src={Expensicons.DotIndicator} fill={props.type === 'error' ? colors.red : colors.green} />
             </View>
             <View style={styles.offlineFeedback.textContainer}>
                 {_.map(sortedMessages, (message, i) => (

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -19,7 +19,6 @@ import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import Text from '../Text';
 import SubscriptAvatar from '../SubscriptAvatar';
 import CONST from '../../CONST';
-import variables from '../../styles/variables';
 import themeColors from '../../styles/themes/default';
 import SidebarUtils from '../../libs/SidebarUtils';
 import TextPill from '../TextPill';
@@ -207,8 +206,6 @@ const OptionRowLHN = (props) => {
                                         <Icon
                                             src={Expensicons.DotIndicator}
                                             fill={colors.red}
-                                            height={variables.iconSizeNormal}
-                                            width={variables.iconSizeNormal}
                                         />
                                     </View>
                                 )}
@@ -218,28 +215,21 @@ const OptionRowLHN = (props) => {
                             style={[styles.flexRow, styles.alignItemsCenter]}
                             accessible={false}
                         >
-                            {shouldShowGreenDotIndicator && (
-                                <Icon
-                                    height={variables.iconSizeNormal}
-                                    width={variables.iconSizeNormal}
-                                    src={Expensicons.DotIndicator}
-                                    fill={colors.green}
-                                />
-                            )}
+                            {shouldShowGreenDotIndicator && <Icon src={Expensicons.DotIndicator} fill={themeColors.success} />}
                             {optionItem.hasDraftComment && (
                                 <View
                                     style={styles.ml2}
                                     accessibilityLabel={props.translate('sidebarScreen.draftedMessage')}
                                 >
-                                    <Icon src={Expensicons.Pencil} height={16} width={16} />
+                                    <Icon src={Expensicons.Pencil} />
                                 </View>
                             )}
                             {!shouldShowGreenDotIndicator && optionItem.isPinned && (
                                 <View
                                     style={styles.ml2}
                                     accessibilityLabel={props.translate('sidebarScreen.chatPinned')}
                                 >
-                                    <Icon src={Expensicons.Pin} height={16} width={16} />
+                                    <Icon src={Expensicons.Pin} />
                                 </View>
                             )}
                         </View>

diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
@@ -13,7 +13,6 @@ import CONST from '../CONST';
 import menuItemPropTypes from './menuItemPropTypes';
 import SelectCircle from './SelectCircle';
 import colors from '../styles/colors';
-import variables from '../styles/variables';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
 import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
@@ -208,8 +207,6 @@ const MenuItem = (props) => {
                                 <Icon
                                     src={Expensicons.DotIndicator}
                                     fill={props.brickRoadIndicator === 'error' ? colors.red : colors.green}
-                                    height={variables.iconSizeSmall}
-                                    width={variables.iconSizeSmall}
                                 />
                             </View>
                         )}

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
@@ -24,7 +24,6 @@ import SubscriptAvatar from './SubscriptAvatar';
 import OfflineWithFeedback from './OfflineWithFeedback';
 import CONST from '../CONST';
 import * as ReportUtils from '../libs/ReportUtils';
-import variables from '../styles/variables';
 
 const propTypes = {
     /** Style for hovered state */
@@ -263,8 +262,6 @@ class OptionRow extends Component {
                                         <Icon
                                             src={Expensicons.DotIndicator}
                                             fill={themeColors.danger}
-                                            height={variables.iconSizeSmall}
-                                            width={variables.iconSizeSmall}
                                         />
                                     </View>
                                     )}
@@ -279,8 +276,6 @@ class OptionRow extends Component {
                                     <View>
                                         <Icon
                                             src={lodashGet(this.props.option, 'customIcon.src', '')}
-                                            height={16}
-                                            width={16}
                                             fill={lodashGet(this.props.option, 'customIcon.color')}
                                         />
                                     </View>

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
@@ -22,7 +22,6 @@ import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import Text from '../../components/Text';
 import Tooltip from '../../components/Tooltip';
-import variables from '../../styles/variables';
 import colors from '../../styles/colors';
 import reportPropTypes from '../reportPropTypes';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -146,8 +145,6 @@ const HeaderView = (props) => {
                                     <Icon
                                         src={Expensicons.DotIndicator}
                                         fill={colors.red}
-                                        height={variables.iconSizeSmall}
-                                        width={variables.iconSizeSmall}
                                     />
                                 </View>
                             )}