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

Commit 2193adf

Browse files
authored
Merge branch 'deriv-com:master' into performance-mark-on-binary
2 parents 539cf9c + e459364 commit 2193adf

File tree

94 files changed

+2020
-1030
lines changed

Some content is hidden

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

94 files changed

+2020
-1030
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ User can make changes to Deriv branding related logo, text and their visibility.
147147
### Running with a specific endpoint **Use only if you know what you're doing**
148148

149149
```
150-
ENDPOINT='wss://ws.binaryws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
150+
ENDPOINT='wss://ws.derivws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
151151
152152
```
153153

154-
To set the endpoint for running the application on the localhost. For this, Go to http://localbot.binary.sx/endpoint.html. Make sure the Server is set to blue.binaryws.com and O Auth App ID is 16014 Click submit
154+
To set the endpoint for running the application on the localhost. For this, Go to http://localbot.binary.sx/endpoint.html. Make sure the Server is set to blue.derivws.com and O Auth App ID is 16014 Click submit
155155

156156
## Think you found a bug?
157157

package-lock.json

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

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@
101101
"sass-loader": "^13.3.2",
102102
"sha1": "^1.1.1",
103103
"style-loader": "^3.3.3",
104-
"trackjs": "^3.10.1",
104+
"trackjs": "^3.10.4",
105105
"webpack": "^5.88.0",
106106
"webpack-cli": "^5.1.4",
107107
"webpack-dev-server": "^4.15.1"
108108
},
109109
"dependencies": {
110110
"@deriv/deriv-api": "^1.0.9",
111-
"@deriv/deriv-charts": "^1.3.1",
111+
"@deriv/deriv-charts": "^2.0.1",
112112
"@reduxjs/toolkit": "^1.7.1",
113113
"axios": "^0.21.4",
114114
"binary-style": "^0.2.4",
@@ -117,13 +117,12 @@
117117
"commander": "^8.3.0",
118118
"core-js": "^3.18",
119119
"crc-32": "^1.2.0",
120-
"js-cookie": "^3.0.1",
121-
"jwt-decode": "^3.1.2",
120+
"js-cookie": "^3.0.5",
122121
"mobx": "^6.3.12",
123122
"mobx-react": "^7.2.1",
124123
"pako": "^1.0.11",
125-
"react": "^16.14.0",
126-
"react-dom": "^16.14.0",
124+
"react": "^17.0.2",
125+
"react-dom": "^17.0.2",
127126
"react-draggable": "^4.4.4",
128127
"react-helmet": "^6.1.0",
129128
"react-i18next": "^13.0.1",

plugins/fetch-blockly-translations.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ const axios = require('axios');
6262
// eslint-disable-next-line no-console
6363
console.log(outputFile, 'output file');
6464
await fs.writeFile(outputFile, mergedContent, 'utf8', err => {
65-
// eslint-disable-next-line no-console
66-
console.log(err, 'Error fetching blockly');
65+
if (err) {
66+
// eslint-disable-next-line no-console
67+
console.log(err, 'Error fetching blockly');
68+
}
6769
});
6870
})()
6971
.then(() => {

0 commit comments

Comments
 (0)