Skip to content

Commit

Permalink
Merge branch 'master' into fix_2fa_logout
Browse files Browse the repository at this point in the history
  • Loading branch information
@mahdiyeh-deriv
mahdiyeh-deriv committed Aug 1, 2022
2 parents 482c1d0 + 27c786a commit 9d186b2
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 98 deletions.
14 changes: 7 additions & 7 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

170 changes: 85 additions & 85 deletions packages/bot-web-ui/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,87 @@
{
"version": "1.0.0",
"name": "@deriv/bot-web-ui",
"description": "Visual automation for Deriv.com",
"main": "dist/bot/js/bot-web-ui.main.js",
"private": true,
"jest": {
"setupFilesAfterEnv": [
"<rootDir>/.jest"
],
"testPathIgnorePatterns": [
"/node_modules/",
"tools.js",
"Misc.js"
]
},
"engines": {
"node": "^14.17.1"
},
"scripts": {
"start": "npm run test && npm run serve",
"serve": "echo \"Serving...\" && webpack --progress --watch",
"build": "f () { npm run build:skeleton && webpack --progress --env base=$1 ;}; f",
"build:skeleton": "lerna exec --scope @deriv/bot-skeleton -- npm run build",
"build:travis": "echo \"No build:travis specified\"",
"test": "npm run test:mocha",
"test:eslint": "eslint \"./src/**/*.?(js|jsx)\"",
"test:mocha": "echo \"No test:mocha specified\"",
"deploy": "echo \"No deploy specified\"",
"deploy:clean": "echo \"No deploy:clean specified\"",
"deploy:folder": "echo \"No deploy:folder specified\"",
"deploy:staging": "echo \"No deploy:staging specified\"",
"deploy:production": "echo \"No deploy:production specified\""
},
"author": "Binary.com",
"license": "MIT",
"devDependencies": {
"@babel/eslint-parser": "^7.17.0",
"@babel/preset-react": "^7.16.7",
"babel-loader": "^8.1.0",
"chai": "^4.2.0",
"clean-webpack-plugin": "^3.0.0",
"concurrently": "^5.3.0",
"copy-webpack-plugin": "^9.0.1",
"css-hot-loader": "^1.4.4",
"css-loader": "^5.0.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-binary": "^1.0.2",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"lint-staged": "^10.4.0",
"loader-utils": "^1.1.0",
"mini-css-extract-plugin": "^1.3.4",
"node-sass": "^7.0.1",
"raw-loader": "^4.0.0",
"sass-loader": "^12.6.0",
"sass-resources-loader": "^2.1.1",
"stylelint-webpack-plugin": "^2.1.1",
"svg-sprite-loader": "^5.2.1",
"webpack": "^5.46.0",
"webpack-cli": "^4.7.2"
},
"dependencies": {
"@deriv/bot-skeleton": "^1.0.0",
"@deriv/components": "^1.0.0",
"@deriv/deriv-charts": "^0.6.0",
"@deriv/shared": "^1.0.0",
"@deriv/translations": "^1.0.0",
"classnames": "^2.2.6",
"crc-32": "^1.2.0",
"formik": "^2.1.4",
"gh-pages": "^2.1.1",
"immutable": "^3.8.2",
"lz-string": "^1.4.4",
"mobx": "^5.15.7",
"mobx-react": "6.3.1",
"pako": "^1.0.11",
"prop-types": "^15.7.2",
"react": "^16.14.0",
"react-content-loader": "^4.3.2",
"react-dom": "^16.14.0",
"react-transition-group": "^4.3.0"
}
"version": "1.0.0",
"name": "@deriv/bot-web-ui",
"description": "Visual automation for Deriv.com",
"main": "dist/bot/js/bot-web-ui.main.js",
"private": true,
"jest": {
"setupFilesAfterEnv": [
"<rootDir>/.jest"
],
"testPathIgnorePatterns": [
"/node_modules/",
"tools.js",
"Misc.js"
]
},
"engines": {
"node": "^14.17.1"
},
"scripts": {
"start": "npm run test && npm run serve",
"serve": "echo \"Serving...\" && webpack --progress --watch",
"build": "f () { npm run build:skeleton && webpack --progress --env base=$1 ;}; f",
"build:skeleton": "lerna exec --scope @deriv/bot-skeleton -- npm run build",
"build:travis": "echo \"No build:travis specified\"",
"test": "npm run test:mocha",
"test:eslint": "eslint \"./src/**/*.?(js|jsx)\"",
"test:mocha": "echo \"No test:mocha specified\"",
"deploy": "echo \"No deploy specified\"",
"deploy:clean": "echo \"No deploy:clean specified\"",
"deploy:folder": "echo \"No deploy:folder specified\"",
"deploy:staging": "echo \"No deploy:staging specified\"",
"deploy:production": "echo \"No deploy:production specified\""
},
"author": "Binary.com",
"license": "MIT",
"devDependencies": {
"@babel/eslint-parser": "^7.17.0",
"@babel/preset-react": "^7.16.7",
"babel-loader": "^8.1.0",
"chai": "^4.2.0",
"clean-webpack-plugin": "^3.0.0",
"concurrently": "^5.3.0",
"copy-webpack-plugin": "^9.0.1",
"css-hot-loader": "^1.4.4",
"css-loader": "^5.0.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-binary": "^1.0.2",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"lint-staged": "^10.4.0",
"loader-utils": "^1.1.0",
"mini-css-extract-plugin": "^1.3.4",
"node-sass": "^7.0.1",
"raw-loader": "^4.0.0",
"sass-loader": "^12.6.0",
"sass-resources-loader": "^2.1.1",
"stylelint-webpack-plugin": "^2.1.1",
"svg-sprite-loader": "^5.2.1",
"webpack": "^5.46.0",
"webpack-cli": "^4.7.2"
},
"dependencies": {
"@deriv/bot-skeleton": "^1.0.0",
"@deriv/components": "^1.0.0",
"@deriv/deriv-charts": "^0.6.3",
"@deriv/shared": "^1.0.0",
"@deriv/translations": "^1.0.0",
"classnames": "^2.2.6",
"crc-32": "^1.2.0",
"formik": "^2.1.4",
"gh-pages": "^2.1.1",
"immutable": "^3.8.2",
"lz-string": "^1.4.4",
"mobx": "^5.15.7",
"mobx-react": "6.3.1",
"pako": "^1.0.11",
"prop-types": "^15.7.2",
"react": "^16.14.0",
"react-content-loader": "^4.3.2",
"react-dom": "^16.14.0",
"react-transition-group": "^4.3.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"@deriv/cfd": "^1.0.0",
"@deriv/components": "^1.0.0",
"@deriv/deriv-api": "^1.0.8",
"@deriv/deriv-charts": "^0.6.0",
"@deriv/deriv-charts": "^0.6.3",
"@deriv/p2p": "^0.7.3",
"@deriv/reports": "^1.0.0",
"@deriv/shared": "^1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/p2p/src/components/buy-sell/buy-sell-form.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ const BuySellForm = props => {
validate={buy_sell_store.validatePopup}
validateOnMount={!should_disable_field}
initialValues={{
amount: input_amount,
amount: min_order_amount_limit,
contact_info: buy_sell_store.contact_info,
payment_info: buy_sell_store.payment_info,
rate: rate_type === ad_type.FLOAT ? effective_rate : null,
}}
initialErrors={buy_sell_store.is_sell_advert ? { contact_info: true } : {}}
onSubmit={(...args) => buy_sell_store.handleSubmit(() => isMounted(), ...args)}
>
{({ errors, isSubmitting, isValid, setFieldValue, submitForm, touched, values }) => {
{({ errors, isSubmitting, isValid, setFieldValue, submitForm, touched }) => {
buy_sell_store.form_props.setIsSubmitDisabled(
!isValid ||
isSubmitting ||
Expand Down Expand Up @@ -379,7 +379,7 @@ const BuySellForm = props => {
onChange={event => {
if (event.target.value === '') {
setFieldValue('amount', '');
setInputAmount(0);
setInputAmount('');
} else {
const amount = getRoundedNumber(
event.target.value,
Expand All @@ -390,7 +390,7 @@ const BuySellForm = props => {
}
}}
required
value={values.amount}
value={input_amount}
disabled={should_disable_field}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion packages/trader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@deriv/api-types": "1.0.48",
"@deriv/components": "^1.0.0",
"@deriv/deriv-api": "^1.0.8",
"@deriv/deriv-charts": "^0.6.0",
"@deriv/deriv-charts": "^0.6.3",
"@deriv/shared": "^1.0.0",
"@deriv/reports": "^1.0.0",
"@deriv/translations": "^1.0.0",
Expand Down

0 comments on commit 9d186b2

Please sign in to comment.