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

dev app- there are 2 scrollers in the chat (Android & iOS) #1456 #2140

Merged
merged 2 commits into from
Oct 4, 2023
Merged

dev app- there are 2 scrollers in the chat (Android & iOS) #1456 #2140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eceb090
remove double scroll bar in mobile chat
roienatan Oct 4, 2023
95649d6
.
roienatan Oct 4, 2023
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
8 changes: 0 additions & 8 deletions src/pages/common/components/ChatMobileModal/ChatMobileModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@
margin-right: 0.25rem;
}

.content {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
height: calc(100vh - #{$container-mobile-header-height});
}

.commonName {
margin: 0;
}
Expand Down
70 changes: 34 additions & 36 deletions src/pages/common/components/ChatMobileModal/ChatMobileModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,44 +56,42 @@ const ChatMobileModal: FC<ChatMobileModalProps> = (props) => {
isHeaderSticky={Boolean(header)}
mobileFullScreen
>
<div className={styles.content}>
{!header && (
<div className={styles.header}>
<div className={styles.headerContent}>
{hasBackButton && (
<ButtonIcon onClick={onClose}>
<LongLeftArrowIcon className={styles.backButtonIcon} />
</ButtonIcon>
)}
<Image
className={styles.image}
src={commonImage}
alt={`${commonName}'s image`}
placeholderElement={null}
aria-hidden
/>
<p className={styles.commonName}>{commonName}</p>
</div>
{hasCloseIcon && (
<CloseIcon
width={closeIconSize}
height={closeIconSize}
fill={Colors.secondaryBlue}
/>
{!header && (
<div className={styles.header}>
<div className={styles.headerContent}>
{hasBackButton && (
<ButtonIcon onClick={onClose}>
<LongLeftArrowIcon className={styles.backButtonIcon} />
</ButtonIcon>
)}
<Image
className={styles.image}
src={commonImage}
alt={`${commonName}'s image`}
placeholderElement={null}
aria-hidden
/>
<p className={styles.commonName}>{commonName}</p>
</div>
)}
{title && (
<p
className={classNames(styles.title, {
[styles.titleRTL]: isRTL(title),
})}
>
{title}
</p>
)}
<div className={styles.modalChildren}>{children}</div>
</div>
{hasCloseIcon && (
<CloseIcon
width={closeIconSize}
height={closeIconSize}
fill={Colors.secondaryBlue}
/>
)}
</div>
)}
{title && (
<p
className={classNames(styles.title, {
[styles.titleRTL]: isRTL(title),
})}
>
{title}
</p>
)}
<div className={styles.modalChildren}>{children}</div>
</Modal>
);
};
Expand Down
Loading