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

DTRA-2471 / Kate / DND console error #17859

Merged
merged 2 commits into from
Dec 26, 2024
Merged

DTRA-2471 / Kate / DND console error #17859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883150c
chore: remove overflow from parent containers
kate-deriv Dec 19, 2024
fd862f6
refactor: left 1 parent with overflow y
kate-deriv Dec 19, 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 packages/trader/src/AppV2/Components/DraggableList/draggable-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
display: flex;
flex-direction: column;
padding: var(--core-spacing-500) 0;
overflow: auto;
}

&__item {
Expand Down
8 changes: 6 additions & 2 deletions packages/trader/src/AppV2/Containers/Trade/trade-types-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import React from 'react';
import { Button, Text, ActionSheet } from '@deriv-com/quill-ui';
import clsx from 'clsx';

import { Localize } from '@deriv/translations';
import { ActionSheet, Button, Text } from '@deriv-com/quill-ui';

import { DraggableList } from 'AppV2/Components/DraggableList';
import { TradeTypeList } from 'AppV2/Components/TradeTypeList';
import { Localize } from '@deriv/translations';

import { TItem, TResultItem } from './trade-types';

type TTradeTypesContent = {
Expand Down
25 changes: 15 additions & 10 deletions packages/trader/src/AppV2/Containers/Trade/trade-types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import clsx from 'clsx';

import { LabelPairedPresentationScreenSmRegularIcon } from '@deriv/quill-icons';
import { useTraderStore } from 'Stores/useTraderStores';
import { Button, Chip, Text, ActionSheet } from '@deriv-com/quill-ui';
import { DraggableList } from 'AppV2/Components/DraggableList';
import { TradeTypeList } from 'AppV2/Components/TradeTypeList';
import { getTradeTypesList, sortCategoriesInTradeTypeOrder } from 'AppV2/Utils/trade-types-utils';
import { checkContractTypePrefix } from 'AppV2/Utils/contract-type';
import { Localize, localize } from '@deriv/translations';
import { safeParse } from '@deriv/utils';
import TradeTypesSelectionGuide from 'AppV2/Components/OnboardingGuide/TradeTypesSelectionGuide';
import { ActionSheet, Button, Chip, Text } from '@deriv-com/quill-ui';

import Carousel from 'AppV2/Components/Carousel';
import CarouselHeader from 'AppV2/Components/Carousel/carousel-header';
import TradeTypesContent from './trade-types-content';
import Guide from '../../Components/Guide';
import TradeTypesSelectionGuide from 'AppV2/Components/OnboardingGuide/TradeTypesSelectionGuide';
import { checkContractTypePrefix } from 'AppV2/Utils/contract-type';
import { getTradeTypesList, sortCategoriesInTradeTypeOrder } from 'AppV2/Utils/trade-types-utils';
import { useTraderStore } from 'Stores/useTraderStores';

import { sendOpenGuideToAnalytics } from '../../../Analytics';
import Guide from '../../Components/Guide';

import TradeTypesContent from './trade-types-content';

type TTradeTypesProps = {
onTradeTypeSelect: (
Expand Down Expand Up @@ -278,7 +281,9 @@ const TradeTypes = ({ contract_type, onTradeTypeSelect, trade_types, is_dark_mod
</Button>
)}
<ActionSheet.Root
className='trade-types-dialog'
className={clsx('trade-types-dialog', {
'trade-types-dialog--is_editing': is_editing,
})}
isOpen={is_open}
expandable={false}
onClose={handleCloseTradeTypes}
Expand Down
7 changes: 7 additions & 0 deletions packages/trader/src/AppV2/Containers/Trade/trade.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,18 @@
}
}
}

.quill-action-sheet--portal--wrapper:has(.trade-types-dialog--is_editing) {
overflow-y: hidden;
}
.trade-types-dialog {
&__title {
margin: var(--core-spacing-1200) var(--core-spacing-50);
}
&__content {
padding-top: var(--core-spacing-50);
}
&--is_editing {
overflow: hidden;
}
}
Loading