Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Commit 3f8a181

Browse files
rupato-derivrupato-deriv
committed
resolved merge confict
2 parents 456de70 + a738207 commit 3f8a181

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+5507
-3042
lines changed

‎.github/workflows/main.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎package-lock.json

Lines changed: 2098 additions & 1926 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
"mobx-react": "^5.4.4",
119119
"pako": "^1.0.11",
120120
"react-render-html": "^0.6.0",
121-
"react-slick": "^0.28.1",
121+
"react-slick": "^0.29.0",
122122
"react-transition-group": "^4.0.1",
123-
"slick-carousel": "^1.8.1"
123+
"slick-slider": "^1.8.2"
124124
}
125125
}

‎src/botPage/view/View.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import {
5050
saveBeforeUnload,
5151
} from './blockly/utils';
5252
import { moveToDeriv } from '../../common/utils/utility';
53-
import { setTimeOutBanner } from '../../indexPage/index';
53+
import { setTimeOutBanner, getComponent } from '../../indexPage';
5454

5555
let realityCheckTimeout;
5656
let chart;
@@ -841,6 +841,8 @@ function renderErrorPage() {
841841

842842
// eslint-disable-next-line consistent-return
843843
function renderReactComponents() {
844+
// eslint-disable-next-line no-unused-vars
845+
getComponent();
844846
$('.barspinner').show();
845847
const bannerToken = getStorage('setDueDateForBanner');
846848
const qs = parseQueryString();

‎src/common/lang.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ export const load = () => {
5757
.text()
5858
);
5959

60+
$('.actual_flag').text(`${lang}`);
61+
$('.language_background_flag').addClass(`${lang}_flag_mtd`);
62+
6063
if (lang === 'ach') {
6164
// eslint-disable-next-line no-underscore-dangle
6265
window._jipt = [['project', 'binary-bot']];

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy