Skip to content

Commit 1b71c29

Browse files
sandeep-derivsandeep-deriv
authored
Merge branch 'main' into shafin/BOT/chore--use-webpack
2 parents aebe73c + 2f3c61c commit 1b71c29

37 files changed

+1670
-38
lines changed

‎index.html

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</head>
4343

4444
<body class="body">
45+
<div id="modal_root" class="modal-root"></div>
4546
<div id="root"></div>
4647
<script type="module" src="/src/main.tsx"></script>
4748
</body>

‎public/assets/icons/IcFilter.svg

+1
Loading

‎public/assets/icons/IcMenuDots.svg

+1
Loading

‎public/assets/icons/IcUserGuide.svg

+1
Loading

‎src/app/app.scss

+22-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.bot {
22
--bot-content-height: calc(100vh - 140px);
3-
--bot-content-width: calc(100vw - 366px); //run-panel is open by default
3+
--bot-content-width: calc(100vw - 366px);
44
--drawer-content-height: calc(100vh - 394px);
55
--drawer-content-height-no-stat: calc(100vh - 233px);
66
--drawer-scroll-height: calc(100vh - 365px);
@@ -15,3 +15,24 @@
1515
background: var(--general-section-1);
1616
}
1717
}
18+
19+
.modal-root {
20+
position: absolute;
21+
top: 0;
22+
display: flex;
23+
justify-content: center;
24+
align-items: center;
25+
width: 100%;
26+
height: 100%;
27+
bottom: 0;
28+
left: 0;
29+
background: rgba(0, 0, 0, 0.72);
30+
right: 0;
31+
opacity: 0;
32+
z-index: -1;
33+
}
34+
.modal-root:not(:empty) {
35+
display: flex;
36+
opacity: 1;
37+
z-index: 10;
38+
}

‎src/components/download/download.scss

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
padding: 12px;
55
padding-left: 16px;
66
border: solid 1px var(--general-section-1);
7-
8-
.download__button,
97
&__view-detail-button {
108
height: 3.2rem;
119
}
1210
}
1311
}
12+
13+
.run-panel__info {
14+
.download__button {
15+
height: 3.2rem;
16+
}
17+
}

‎src/components/journal/journal-components/filters.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ const Filters = ({
1515
return (
1616
<Checkbox
1717
key={item.id}
18-
classNameLabel={classNameLabel}
19-
value={hasFilter}
20-
defaultChecked={hasFilter}
18+
labelClassName={classNameLabel}
19+
checked={hasFilter}
2120
label={item.label}
2221
onChange={() => filterMessage(!hasFilter, item.id)}
23-
/>
22+
name={item.id} />
2423
);
2524
})}
2625
</div>

‎src/components/journal/journal-components/journal-tools.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const JournalTools = ({
2020
<div className='journal-tools__container'>
2121
<Download tab='journal' />
2222
<div ref={toggle_ref} className='journal-tools__container-filter' onClick={toggleFilterDialog}>
23-
<Text size='xs' className='journal-tools__container-filter--label'>
23+
<Text size='sm' weight='normal' className='journal-tools__container-filter--label'>
2424
<Localize i18n_default_text='Filters' />
2525
</Text>
2626
<Icon icon='IcFilter' size={16} />

‎src/components/journal/journal.scss

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@
6565
&--label {
6666
margin-inline-end: 0.8rem;
6767
}
68+
69+
.deriv-text {
70+
font-weight: lighter;
71+
}
6872
}
6973
}
7074
}

‎src/components/journal/journal.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -50,41 +50,41 @@ const Journal = observer(() => {
5050
) : (
5151
<>
5252
{contract_stage >= contract_stages.STARTING &&
53-
!!Object.keys(checked_filters as TCheckedFilters).length &&
54-
!unfiltered_messages_length &&
55-
is_stop_button_visible ? (
53+
!!Object.keys(checked_filters as TCheckedFilters).length &&
54+
!unfiltered_messages_length &&
55+
is_stop_button_visible ? (
5656
<JournalLoader is_mobile={is_mobile} />
5757
) : (
5858
<div className='journal-empty'>
5959
<Icon icon='IcBox' className='journal-empty__icon' size={64} color='secondary' />
6060
<Text
6161
as='h4'
62-
size='xs'
62+
size='sm'
6363
weight='bold'
6464
align='center'
6565
color='less-prominent'
66-
lineHeight='xs'
66+
lineHeight='sm'
6767
className='journal-empty__header'
6868
>
6969
{localize('There are no messages to display')}
7070
</Text>
7171
<div className='journal-empty__message'>
72-
<Text size='xs' color='less-prominent'>
72+
<Text size='xs' lineHeight='3xl' color='less-prominent'>
7373
{localize('Here are the possible reasons:')}
7474
</Text>
7575
<ul className='journal-empty__list'>
7676
<li>
77-
<Text size='xs' color='less-prominent'>
77+
<Text size='xs' lineHeight='3xl' color='less-prominent'>
7878
{localize('The bot is not running')}
7979
</Text>
8080
</li>
8181
<li>
82-
<Text size='xs' color='less-prominent'>
82+
<Text size='xs' lineHeight='3xl' color='less-prominent'>
8383
{localize('The stats are cleared')}
8484
</Text>
8585
</li>
8686
<li>
87-
<Text size='xs' color='less-prominent'>
87+
<Text size='xs' lineHeight='3xl' color='less-prominent'>
8888
{localize('All messages are filtered out')}
8989
</Text>
9090
</li>

0 commit comments

Comments
 (0)