From ee4fbeecbbe84aafbb749c033fe232db514b1b7d Mon Sep 17 00:00:00 2001 From: Prince Mendiratta Date: Fri, 28 Apr 2023 13:10:11 +0530 Subject: [PATCH 1/4] feat: make all dotindicator & related icon 20x20 Signed-off-by: Prince Mendiratta --- src/components/DotIndicatorMessage.js | 3 +-- src/components/LHNOptionsList/OptionRowLHN.js | 7 ++----- src/components/MenuItem.js | 3 --- src/components/OptionRow.js | 5 ----- src/pages/home/HeaderView.js | 3 --- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/components/DotIndicatorMessage.js b/src/components/DotIndicatorMessage.js index 0ad914db7d78..6db20fc004ab 100644 --- 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 ( - + {_.map(sortedMessages, (message, i) => ( diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js index 51dd75f19bb1..a580037b554d 100644 --- 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'; @@ -205,8 +204,6 @@ const OptionRowLHN = (props) => { )} @@ -221,7 +218,7 @@ const OptionRowLHN = (props) => { style={styles.ml2} accessibilityLabel={props.translate('sidebarScreen.draftedMessage')} > - + )} {optionItem.hasOutstandingIOU && !optionItem.isIOUReportOwner && } @@ -230,7 +227,7 @@ const OptionRowLHN = (props) => { style={styles.ml2} accessibilityLabel={props.translate('sidebarScreen.chatPinned')} > - + )} diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js index fd525ee2dd1f..a1ce14266d68 100644 --- 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'; @@ -205,8 +204,6 @@ const MenuItem = (props) => { )} diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js index dcfc7e3ca382..b95bb09bc042 100644 --- 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 { )} @@ -279,8 +276,6 @@ class OptionRow extends Component { diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index c02683e3bcae..04c9b54bdbb0 100644 --- 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'; @@ -153,8 +152,6 @@ const HeaderView = (props) => { )} From 0b993d66b786e0be85d596e1e90cde6c8f788b3a Mon Sep 17 00:00:00 2001 From: Prince Mendiratta Date: Fri, 28 Apr 2023 13:11:04 +0530 Subject: [PATCH 2/4] feat: make pencil & pin icon adjacent Signed-off-by: Prince Mendiratta --- src/components/LHNOptionsList/OptionRowLHN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js index a580037b554d..33532e1fd6b5 100644 --- a/src/components/LHNOptionsList/OptionRowLHN.js +++ b/src/components/LHNOptionsList/OptionRowLHN.js @@ -213,6 +213,7 @@ const OptionRowLHN = (props) => { style={[styles.flexRow, styles.alignItemsCenter]} accessible={false} > + {optionItem.hasOutstandingIOU && !optionItem.isIOUReportOwner && } {optionItem.hasDraftComment && ( { )} - {optionItem.hasOutstandingIOU && !optionItem.isIOUReportOwner && } {optionItem.isPinned && ( Date: Tue, 2 May 2023 18:02:00 +0530 Subject: [PATCH 3/4] fix: use green color Signed-off-by: Prince Mendiratta --- src/components/LHNOptionsList/OptionRowLHN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js index 2c9fcfcfd218..b789d9587f71 100644 --- a/src/components/LHNOptionsList/OptionRowLHN.js +++ b/src/components/LHNOptionsList/OptionRowLHN.js @@ -215,7 +215,7 @@ const OptionRowLHN = (props) => { style={[styles.flexRow, styles.alignItemsCenter]} accessible={false} > - {shouldShowGreenDotIndicator && } + {shouldShowGreenDotIndicator && } {optionItem.hasDraftComment && ( Date: Tue, 2 May 2023 18:53:41 +0530 Subject: [PATCH 4/4] fix: use green color via themeColors Signed-off-by: Prince Mendiratta --- src/components/LHNOptionsList/OptionRowLHN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js index b789d9587f71..3acc336929de 100644 --- a/src/components/LHNOptionsList/OptionRowLHN.js +++ b/src/components/LHNOptionsList/OptionRowLHN.js @@ -215,7 +215,7 @@ const OptionRowLHN = (props) => { style={[styles.flexRow, styles.alignItemsCenter]} accessible={false} > - {shouldShowGreenDotIndicator && } + {shouldShowGreenDotIndicator && } {optionItem.hasDraftComment && (