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

fix: fix claiming for timelocked activity #5849

Merged
merged 10 commits into from Feb 23, 2023

Conversation

MarkNerdi996
Copy link
Contributor

Summary

This PR fixes the calculation of the async status for activities. And with this fix, timelocked activities are again claimable

Changelog

- fix the calculation of async status for activities

Testing

Platforms

Please select any platforms where your changes have been tested.

  • Desktop
    • MacOS
    • Linux
    • Windows
  • Mobile
    • iOS
    • Android

Instructions

Please describe the specific instructions, configurations, and/or test cases necessary to test and verify that your changes work as intended.

...

Checklist

Please tick the following boxes that are relevant to your changes.

  • I have followed the contribution guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or modified tests that prove my changes work as intended
  • I have verified that new and existing unit tests pass locally with my changes
  • I have verified that my latest changes pass CI workflows for testing and linting
  • I have made corresponding changes to the documentation

@MarkNerdi996 MarkNerdi996 added type:fix Fix for bug context:wallet stardust Related to the Stardust Protocol labels Feb 13, 2023
@MarkNerdi996 MarkNerdi996 self-assigned this Feb 13, 2023
@MarkNerdi996 MarkNerdi996 linked an issue Feb 13, 2023 that may be closed by this pull request
3 tasks
Copy link
Contributor

@nicole-obrien nicole-obrien left a comment

Choose a reason for hiding this comment

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

I have sent you some comments privately about cases that are not working as expected

@MarkNerdi996 MarkNerdi996 linked an issue Feb 16, 2023 that may be closed by this pull request
3 tasks
@MarkNerdi996 MarkNerdi996 removed a link to an issue Feb 16, 2023
3 tasks
Copy link
Contributor

@nicole-obrien nicole-obrien left a comment

Choose a reason for hiding this comment

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

We still have some issues with the states of the activity tiles.
When I am sending with a SDRUC only, it is showing the timelock icon from both sender and receiver perspective.
When sending witha timelock to an external address, it is showing the timelock on the senders activity when it is not needed.
When a timelock or expiration unlock expires we no longer need to show the icon.

Copy link
Contributor

@nicole-obrien nicole-obrien left a comment

Choose a reason for hiding this comment

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

LGTM!

@nicole-obrien nicole-obrien merged commit cbd8515 into develop Feb 23, 2023
@nicole-obrien nicole-obrien deleted the fix/fix-claiming-on-timelocks branch February 23, 2023 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
context:wallet stardust Related to the Stardust Protocol type:fix Fix for bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Task]: Enable claiming outputs with SDRUC after a timelock as expired
2 participants