Skip to content

Commit efc3f97

Browse files
committed
Merge branch 'ios-fix-scrolling-in-txdetail-dialog'
2 parents 482cd12 + 5a08835 commit efc3f97

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

frontends/web/src/components/dialog/dialog.module.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
width: 100%;
1212
background: transparent;
1313
z-index: 4010;
14+
touch-action: none;
15+
overscroll-behavior: contain;
1416
}
1517

1618
.overlay.activeOverlay {
@@ -26,6 +28,8 @@
2628
text-align: left;
2729
max-height: calc(100dvh - calc(env(safe-area-inset-top) * 2));
2830
overflow: auto;
31+
touch-action: auto;
32+
-webkit-overflow-scrolling: touch;
2933
}
3034
/* guard dialog and wait-dialog from view styles */
3135
@media (min-width: 1200px) {

frontends/web/src/routes/account/send/components/inputs/note-input.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import { ChangeEvent } from 'react';
1818
import { useTranslation } from 'react-i18next';
1919
import { Input } from '@/components/forms';
20+
import { useMediaQuery } from '@/hooks/mediaquery';
2021
import style from './note-input.module.css';
2122

2223
type TProps = {
@@ -25,6 +26,7 @@ type TProps = {
2526
};
2627

2728
export const NoteInput = ({ onNoteChange, note }: TProps) => {
29+
const isMobile = useMediaQuery('(max-width: 768px)');
2830
const { t } = useTranslation();
2931
return (
3032
<Input
@@ -34,6 +36,7 @@ export const NoteInput = ({ onNoteChange, note }: TProps) => {
3436
{t('note.input.description')}
3537
</span>
3638
}
39+
autoFocus={!isMobile}
3740
id="note"
3841
onInput={(e: ChangeEvent<HTMLInputElement>) => onNoteChange(e.target.value)}
3942
value={note}

0 commit comments

Comments
 (0)