Skip to content

Commit

Permalink
Merge pull request #83 from Chat-Your-Way/CHAT-220--smile-disable
Browse files Browse the repository at this point in the history
Disabled Smile icon button
  • Loading branch information
IlliaKomissarov authored Feb 21, 2024
2 parents 4b181ee + 184abf0 commit 50b10f9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/components/Chat/Chat.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
ChatWrap,
IconActivity,
IconSend,
IconSmile,
// IconSmile, //! CHAT-220--smile-disable
IndicatorBox,
InfoBox,
InfoMoreBox,
Expand Down Expand Up @@ -143,7 +143,7 @@ const Chat = ({ children }) => {
onChange={(e) => handleMessageChange(e.target.value)}
/>
<ChatInputIconBox>
<IconButton icon={<IconSmile />} />
{/* <IconButton icon={<IconSmile />} /> //! CHAT-220--smile-disable */}
<IconButton icon={<IconSend />} />
</ChatInputIconBox>
</InputBox>
Expand Down
9 changes: 5 additions & 4 deletions src/components/Chat/Chat.styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export const TextMessage = styled(Box)`
export const InputBox = styled(Box)`
display: flex;
position: relative;
align-items: center;
`;

export const ChatInputStyled = styled(TextareaAutosize)`
Expand All @@ -159,14 +160,14 @@ export const ChatInputStyled = styled(TextareaAutosize)`
export const ChatInputIconBox = styled(Box)`
display: flex;
position: absolute;
bottom: 4px;
bottom: 8px;
right: 20px;
gap: 10px;
`;

export const IconSmile = styled(ICONS.SMILE)`
fill: ${(p) => p.theme.palette.primary.dark};
`;
// export const IconSmile = styled(ICONS.SMILE)`
// fill: ${(p) => p.theme.palette.primary.dark};
// `; //! CHAT-220--smile-disable

export const IconSend = styled(ICONS.SEND)`
fill: ${(p) => p.theme.palette.primary.dark};
Expand Down
2 changes: 1 addition & 1 deletion src/ui-kit/components/IconButton/IconButton.styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const StyledIconButton = styled(IconButton, {
padding-left: ${(p) => (p.pLeft ? p.pLeft : '3.13px')};
padding-right: ${(p) => (p.pRight ? p.pRight : '4.71px')};
padding-top: ${(p) => (p.pTop ? p.pTop : '3.13px')};
padding-bottom: ${(p) => (p.pBottom ? p.pBottom : '4.71px')};
padding-bottom: ${(p) => (p.pBottom ? p.pBottom : '3.13px')};
fill: ${(p) => (p.defaultFill && !p.editPath ? p.defaultFill : undefined)};
path {
fill: ${(p) => (p.defaultFill && p.editPath ? p.defaultFill : undefined)};
Expand Down
4 changes: 2 additions & 2 deletions src/ui-kit/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import { ReactComponent as Setting } from './svg-icons/Setting.svg';
import { ReactComponent as ShieldDone } from './svg-icons/ShieldDone.svg';
import { ReactComponent as ShieldFail } from './svg-icons/ShieldFail.svg';
import { ReactComponent as Show } from './svg-icons/Show.svg';
import { ReactComponent as Smile } from './svg-icons/Smile.svg';
// import { ReactComponent as Smile } from './svg-icons/Smile.svg'; //! CHAT-220--smile-disable
import { ReactComponent as Star } from './svg-icons/Star.svg';
import { ReactComponent as Subscribe } from './svg-icons/Subscribe.svg';
import { ReactComponent as Swap } from './svg-icons/Swap.svg';
Expand Down Expand Up @@ -145,7 +145,7 @@ export const ICONS = {
SHIELD_DONE: ShieldDone,
SHIELD_FAIL: ShieldFail,
SHOW: Show,
SMILE: Smile,
// SMILE: Smile, //! CHAT-220--smile-disable
STAR: Star,
SUBSCRIBE: Subscribe,
SWAP: Swap,
Expand Down

0 comments on commit 50b10f9

Please sign in to comment.