Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed icon fill colors #33607

Merged
merged 9 commits into from
Jan 9, 2024
Merged

Fixed icon fill colors #33607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fada9bf
fixed plaid account icon
shubham1206agra Dec 26, 2023
1538f92
Merge branch 'Expensify:main' into fix-plaid-icon
shubham1206agra Dec 30, 2023
24b7c4a
fixed illustrations
shubham1206agra Dec 30, 2023
863fda9
Merge branch 'Expensify:main' into fix-plaid-icon
shubham1206agra Jan 4, 2024
206a90d
fixed icon with colors
shubham1206agra Jan 4, 2024
cde4c3d
removed extra prop
shubham1206agra Jan 4, 2024
9c70ec9
fix lint
shubham1206agra Jan 4, 2024
9979e91
Merge branch 'main' into fix-plaid-icon
shubham1206agra Jan 6, 2024
bd6a858
changed fill color for image crop mask
shubham1206agra Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/AddPlaidBankAccount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ function AddPlaidBankAccount({
height={iconSize}
width={iconSize}
additionalStyles={iconStyles}
fill={theme.icon}
/>
<Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/components/AvatarCropModal/ImageCropView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function ImageCropView(props) {
<View style={[containerStyle, styles.l0, styles.b0, styles.pAbsolute]}>
<Icon
src={props.maskImage}
fill={theme.icon}
fill={theme.iconReversed}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason for keeping this value remained here only? I see all other fill values are removed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For applying maskImage based on theme we have kept that, comment ref

width={props.containerSize}
height={props.containerSize}
/>
Expand Down
1 change: 0 additions & 1 deletion src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ function DeeplinkRedirectLoadingIndicator({openLinkInBrowser, session}: Deeplink
<Icon
width={200}
height={164}
fill={theme.icon}
src={Illustrations.RocketBlue}
/>
</View>
Expand Down
1 change: 0 additions & 1 deletion src/components/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,6 @@ function MenuItem(
src={furtherDetailsIcon}
height={variables.iconSizeNormal}
width={variables.iconSizeNormal}
fill={theme.icon}
inline
/>
)}
Expand Down
1 change: 0 additions & 1 deletion src/components/ValidateCode/ValidateCodeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ function ValidateCodeModal({code, accountID, session = {}}: ValidateCodeModalPro
<Icon
width={variables.modalTopIconWidth}
height={variables.modalTopIconHeight}
fill={theme.icon}
src={Illustrations.MagicCode}
/>
</View>
Expand Down
1 change: 0 additions & 1 deletion src/pages/LogInWithShortLivedAuthTokenPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ function LogInWithShortLivedAuthTokenPage(props) {
<Icon
width={200}
height={164}
fill={theme.icon}
src={Illustrations.RocketBlue}
/>
</View>
Expand Down
3 changes: 0 additions & 3 deletions src/pages/home/report/ReportDropUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';

const propTypes = {
Expand All @@ -15,15 +14,13 @@ const propTypes = {
};

function ReportDropUI({onDrop}) {
const theme = useTheme();
const styles = useThemeStyles();
const {translate} = useLocalize();
return (
<DragAndDropConsumer onDrop={onDrop}>
<View style={[styles.reportDropOverlay, styles.w100, styles.h100, styles.justifyContentCenter, styles.alignItemsCenter]}>
<View style={styles.mb3}>
<Icon
fill={theme.icon}
src={Expensicons.DragAndDrop}
width={100}
height={100}
Expand Down
1 change: 1 addition & 0 deletions src/pages/settings/Wallet/TransferBalancePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ function TransferBalancePage(props) {
iconHeight={selectedAccount.iconSize}
icon={selectedAccount.icon}
onPress={() => navigateToChooseTransferAccount(selectedAccount.accountType)}
displayInDefaultIconColor
/>
)}
<View style={styles.ph5}>
Expand Down
Loading