Skip to content

Commit 05303ff

Browse files
Merge pull request #21 from maryia-matskevich-deriv/maryia/bot_builder_toolbar
[BOT]Maryia/feat: make work run panel with summary, transactions tabs
2 parents 6450a8e + e101810 commit 05303ff

File tree

9 files changed

+31
-12
lines changed

9 files changed

+31
-12
lines changed

public/assets/icons/IcBox.svg

Lines changed: 1 addition & 0 deletions
Loading

public/assets/icons/IcCross.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

src/components/download/download.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44
padding: 12px;
55
padding-left: 16px;
66
border: solid 1px var(--general-section-1);
7+
8+
.download__button,
9+
&__view-detail-button {
10+
height: 3.2rem;
11+
}
712
}
813
}

src/components/download/download.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,19 @@ const Download = observer(({ tab }: TDownloadProps) => {
9797
>
9898
<Button
9999
id='download-button'
100-
is_disabled={disabled}
100+
disabled={disabled}
101101
className='download__button'
102102
icon={
103103
<Icon icon='IcDbotDownload' color={disabled ? 'disabled' : undefined} className='download__icon' />
104104
}
105-
text={localize('Download')}
106105
onClick={clickFunction}
107-
secondary
108-
/>
106+
variant='outlined'
107+
color='black'
108+
size='sm'
109+
textSize='sm'
110+
>
111+
{localize('Download')}
112+
</Button>
109113
</Popover>
110114
);
111115
});

src/components/run-panel/run-panel.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import React from 'react';
22
import classNames from 'classnames';
33
import { observer } from 'mobx-react-lite';
44

5-
import { Button, Modal, Tabs, Text } from '@deriv-com/ui';
5+
import { Button, Modal, Text } from '@deriv-com/ui';
66

77
import Journal from '@/components/journal';
88
import SelfExclusion from '@/components/self-exclusion';
99
import Drawer from '@/components/shared_ui/drawer';
1010
import Money from '@/components/shared_ui/money';
11+
import Tabs from '@/components/shared_ui/tabs';
1112
import Summary from '@/components/summary';
1213
import TradeAnimation from '@/components/trade-animation';
1314
import Transactions from '@/components/transactions';
@@ -154,8 +155,10 @@ const DrawerFooter = ({ is_clear_stat_disabled, onClearStatClick }: TDrawerFoote
154155
className='run-panel__footer-button'
155156
disabled={is_clear_stat_disabled}
156157
onClick={onClearStatClick}
157-
has_effect
158158
variant='outlined'
159+
color='black'
160+
size='sm'
161+
textSize='sm'
159162
>
160163
<span>{localize('Reset')}</span>
161164
</Button>

src/components/transactions/transactions.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,18 @@ const Transactions = observer(({ is_drawer_open }: TTransactions) => {
114114
<Button
115115
id='download__container__view-detail-button'
116116
className='download__container__view-detail-button'
117-
is_disabled={!transaction_list?.length}
118-
text={localize('View Detail')}
117+
disabled={!transaction_list?.length}
119118
onClick={() => {
120119
toggleTransactionDetailsModal(true);
121120
}}
122-
secondary
123121
icon={<Icon icon='IcDbotViewDetail' size={18} />}
124-
/>
122+
variant='outlined'
123+
color='black'
124+
size='sm'
125+
textSize='sm'
126+
>
127+
{localize('View Detail')}
128+
</Button>
125129
</div>
126130
<div className='transactions__header'>
127131
<span className='transactions__header-column transactions__header-type'>{localize('Type')}</span>

src/pages/bot-builder/toolbox/search-box/search-box.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Field as FormField, FieldProps, Form, Formik } from 'formik';
22

3-
import { Input } from '@deriv-com/ui';
4-
3+
import Input from '@/components/shared_ui/input';
54
import { localize } from '@/utils/tmp/dummy';
65

76
import SearchIcon from './search-icon';

0 commit comments

Comments
 (0)