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.

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

Hamza/90782/useless tooltip deal cancellation #7958

Merged
Changes from 2 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
f326668
fix: deal cancellation tooltip removed the checkbox
hamza-deriv Mar 20, 2023
7c23137
Merge branch 'master' of github.com:binary-com/deriv-app into hamza/9…
hamza-deriv Mar 20, 2023
89864b0
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 3, 2023
a422d71
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 12, 2023
3ab7bc8
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 12, 2023
b234b4f
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 12, 2023
cfe4ccf
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 12, 2023
2861933
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 12, 2023
8b24486
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 12, 2023
16850c6
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 13, 2023
80e4860
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 17, 2023
c827924
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 18, 2023
4765395
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 18, 2023
63d5cfe
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 18, 2023
75bb7e4
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 18, 2023
ab097a7
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 18, 2023
cc0c079
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 18, 2023
0dd5a2e
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 19, 2023
099c61c
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 19, 2023
d6473df
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 20, 2023
9fbc337
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 20, 2023
391608c
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 20, 2023
009357a
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 20, 2023
8295164
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 25, 2023
ef6d163
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 25, 2023
71e58a0
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 26, 2023
98ef4d9
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 27, 2023
23e1ee0
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 27, 2023
9ab7563
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 28, 2023
e8a13d1
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 28, 2023
933b312
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 28, 2023
7c8bc54
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv Apr 28, 2023
655c592
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 2, 2023
a2b3718
Merge branch 'master' of github.com:binary-com/deriv-app into hamza/9…
hamza-deriv May 3, 2023
aa83fe7
fix: Merge conflicts resolved
hamza-deriv May 3, 2023
c1734fe
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 5, 2023
373cd9a
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 5, 2023
104572e
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 5, 2023
4587843
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 8, 2023
45e28ee
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 8, 2023
49e6687
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 9, 2023
56d06b5
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 9, 2023
4ef393f
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 9, 2023
254c3a7
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 10, 2023
bc59851
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 10, 2023
9c120e2
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 10, 2023
ba16297
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 10, 2023
771be88
Merge branch 'master' into hamza/90782/useless_tooltip_deal_cancellation
hamza-deriv May 11, 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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import { isDesktop, isMobile } from '@deriv/shared';
import ContractCardDialog from './contract-card-dialog.jsx';
import ContractUpdateForm from './contract-update-form.jsx';
import PopoverMessageCheckbox from '../../popover-message-checkbox';
import Icon from '../../icon';
import DesktopWrapper from '../../desktop-wrapper';
import MobileDialog from '../../mobile-dialog';
Expand Down Expand Up @@ -33,7 +32,7 @@ const ToggleCardDialog = ({
const [is_visible, setIsVisible] = React.useState(false);
const [top, setTop] = React.useState(0);
const [left, setLeft] = React.useState(0);
const [is_do_not_show_selected, setIsDoNotShowSelected] = React.useState(!should_show_cancellation_warning);
const is_do_not_show_selected = !should_show_cancellation_warning;

const toggle_ref = React.useRef();
const dialog_ref = React.useRef();
Expand Down Expand Up @@ -75,10 +74,6 @@ const ToggleCardDialog = ({
}
};

const onPopoverCheckboxChange = () => {
setIsDoNotShowSelected(!is_do_not_show_selected);
};

const toggleDialog = e => {
e.preventDefault();
e.stopPropagation();
Expand Down Expand Up @@ -114,15 +109,7 @@ const ToggleCardDialog = ({
is_bubble_hover_enabled
margin={2}
zIndex={2}
message={
<PopoverMessageCheckbox
defaultChecked={is_do_not_show_selected}
checkboxLabel={getCardLabels().DONT_SHOW_THIS_AGAIN}
message={getCardLabels().TAKE_PROFIT_LOSS_NOT_AVAILABLE}
name='should_show_cancellation_warning'
onChange={onPopoverCheckboxChange}
/>
}
message={getCardLabels().TAKE_PROFIT_LOSS_NOT_AVAILABLE}
onBubbleClose={onPopoverClose}
>
<div className='dc-contract-card-dialog-toggle__wrapper'>{edit_icon}</div>
Expand Down