Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rupato/BOT-2621/fix: added default values to currency block #216

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Rupato/BOT-2621/fix: added default values to currency block #216

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bd96d0
fix: added default values to currency block
rupato-deriv Dec 18, 2024
fe295b1
fix: added default values to currency block
rupato-deriv Dec 18, 2024
50662cb
fix: added default values to currency block
rupato-deriv Dec 18, 2024
631f343
fix: added default values to currency block
rupato-deriv Dec 18, 2024
e4a923f
fix: added default values to currency block
rupato-deriv Dec 18, 2024
f758b6f
fix: added default values to currency block
rupato-deriv Dec 19, 2024
210d172
fix: added default values to currency block
rupato-deriv Dec 19, 2024
8a9e5b2
fix: null check
rupato-deriv Dec 19, 2024
4e9ce9f
fix: validation on blocks
rupato-deriv Dec 20, 2024
48c2c70
fix: validation on blocks
rupato-deriv Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 89 additions & 51 deletions ...rnal/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_tradeoptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
const new_value = value.includes('.') ? parseFloat(`${value}`) : parseInt(`${value}`);
input_target.setFieldValue(new_value.toString(), 'NUM');
}
if (input.name === 'AMOUNT') {
this.validateAmount(value);
} else if (input.name === 'DURATION') {
this.validateDuration(value);
}
});
}

Expand Down Expand Up @@ -242,12 +247,14 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
const { currency, landing_company_shortcode } = DBotStore.instance.client;
if (isAuthorizing$.getValue()) return;
account_limits.getStakePayoutLimits(currency, landing_company_shortcode, this.selected_market).then(limits => {
if (!this.getField('AMOUNT_LIMITS')) {
return;
}
const unsupported_trade_types = ['multiplier', 'accumulator'];
if (unsupported_trade_types.includes(this.selected_trade_type)) return;
const currency_block = this.getField('CURRENCY_LIST')?.getSourceBlock();
const currency_child_block = currency_block?.getChildren()?.[1]?.getField('NUM');
if (!this.getField('AMOUNT_LIMITS') && !currency_block && !currency_child_block) return;
this.amount_limits = limits;
const { max_payout, min_stake } = limits;
if (max_payout && min_stake && this.selected_trade_type !== 'multiplier') {
if (max_payout && min_stake) {
runIrreversibleEvents(() => {
this.setFieldValue(
localize('(min: {{min_stake}} - max: {{max_payout}})', {
Expand All @@ -257,6 +264,9 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
'AMOUNT_LIMITS'
);
});
if (currency_block && currency_child_block) {
currency_child_block.setValue(this.amount_limits?.min_stake);
}
}
});
},
Expand Down Expand Up @@ -530,57 +540,85 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
return container;
},
restricted_parents: ['trade_definition'],
getRequiredValueInputs() {
return {
AMOUNT: input => {
const input_number = Number(input);
const max_payout = this.amount_limits?.max_payout;
const min_stake = this.amount_limits?.min_stake;
if (min_stake && input_number < min_stake) {
this.error_message = localize("Please enter a stake amount that's at least {{min_stake}}.", {
min_stake,
});
return input_number < min_stake;
}
if (max_payout && input_number > max_payout) {
this.error_message = localize("Please enter a payout amount that's lower than {{max_payout}}.", {
max_payout,
});
return input_number > max_payout;
}
this.error_message = localize('Amount must be a positive number.');
return !isNaN(input_number) && input_number <= 0;
},
DURATION: input => {
const input_number = Number(input);
validateAmount(input) {
const input_number = Number(input);
const max_payout = this.amount_limits?.max_payout;
const min_stake = this.amount_limits?.min_stake;
const highlight_class = 'block--error-highlighted';
if (min_stake && input_number < min_stake) {
if (!this.error_message) {
this.error_message = localize("Please enter a stake amount that's at least {{min_stake}}.", {
min_stake,
});
this.svgGroup_?.classList?.add(highlight_class);
} else {
this.error_message = '';
this.svgGroup_?.classList?.remove(highlight_class);
}
return input_number < min_stake;
}
if (input_number > max_payout) {
if (!this.error_message) {
this.error_message = localize("Please enter a payout amount that's lower than {{max_payout}}.", {
max_payout,
});
this.svgGroup_?.classList?.add(highlight_class);
} else {
this.error_message = '';
this.svgGroup_?.classList?.remove(highlight_class);
}
return input_number > max_payout;
}
this.error_message = localize('Amount must be a positive number.');
return !isNaN(input_number) && input_number <= 0;
},
validateDuration(input) {
const input_number = Number(input);
if (isNaN(input_number) || !this.durations.length) {
return false;
}

if (isNaN(input_number) || !this.durations.length) {
return false;
const duration = this.durations.find(d => d.unit === this.selected_duration);
const highlight_class = 'block--error-highlighted';
if (duration) {
const { min, max } = duration;
const is_valid_duration = input_number >= min && input_number <= max;
if (min === max) {
if (!this.error_message) {
this.error_message = localize(
'Duration value is not allowed. To run the bot, please enter {{min}}.',
{ min }
);
this.svgGroup_?.classList?.add(highlight_class);
} else {
this.error_message = '';
this.svgGroup_?.classList?.remove(highlight_class);
}

const duration = this.durations.find(d => d.unit === this.selected_duration);

if (duration) {
const { min, max } = duration;
const is_valid_duration = input_number >= min && input_number <= max;

if (min === max) {
this.error_message = localize(
'Duration value is not allowed. To run the bot, please enter {{min}}.',
{ min }
);
} else {
this.error_message = localize(
'Duration value is not allowed. To run the bot, please enter a value between {{min}} to {{max}}.',
{ min, max }
);
}

return !is_valid_duration;
} else if (input_number < min || input_number > max) {
if (!this.error_message) {
this.error_message = localize(
'Duration value is not allowed. To run the bot, please enter a value between {{min}} to {{max}}.',
{ min, max }
);
this.svgGroup_?.classList?.add(highlight_class);
} else {
this.error_message = '';
this.svgGroup_?.classList?.remove(highlight_class);
}
} else {
this.error_message = '';
this.svgGroup_?.classList?.remove(highlight_class);
}

return false;
},
return !is_valid_duration;
}

return false;
},
getRequiredValueInputs() {
return {
AMOUNT: input => this.validateAmount(input),
DURATION: input => this.validateDuration(input),
};
},
};
Expand Down
Loading