Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Merge to preprod #565

Merged
merged 59 commits into from
May 4, 2024
Merged

Merge to preprod #565

merged 59 commits into from
May 4, 2024

Conversation

slavas490
Copy link
Contributor

tafonina and others added 30 commits June 9, 2023 14:22
reverse merge from preprod to s-pro dev
sync Preprod branch from main repo
…-methods

remove outdated methods of old smart contract
fix invalid character, updates in BN lib
fix frontend error message for file not found
@@ -1569,7 +1568,7 @@ function condition(){
},
icon: {
face: 'Material Design Icons',
code: '\uf48a',
code: '󰒊',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you're using the Unicode character here instead of the code-string. Why?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slavas490 says he tried to use the hexadecimal string, but it did not work. There seems to be a problem with an unsupported library.

@@ -1133,7 +1133,7 @@ function condition(){
// enable inertial throwing
inertia: false,
onstart: function (event) {
if (event.interaction.downEvent.button === 2) {
if (event?.interaction?.downEvent?.button === 2) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there some problem with this event?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slava says the specs for the third party library we use for drag-and-drop (Interact.js) was changed some time ago, and we should ideally rewrite this piece of code. E.g. start and stop not onstart and onstop

_.tl.y + 'px)'
const translatePos = 'translate(' + _.tl.x + 'px, ' + _.tl.y + 'px)'
_.$dragComp[0].style.webkitTransform = translatePos
_.$dragComp[0].setAttribute('style', 'transform: ' + translatePos)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you're improving the way nodes are being moved. Please document the change in the Pull Request.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original code prevents us from moving the nodes. I approve Slava's code with the disclaimer above.

@loleg
Copy link
Contributor

loleg commented May 4, 2024

Test failed due to temporary network issue.

@loleg loleg merged commit c319235 into ProxeusApp:preprod May 4, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

3 participants