chore: missing changes from main into dev

wainola commented 5 months ago

Description

Becuase of conflicts and not picking up the history in correct manner, I have cherry picked the last commits missing from main into dev

Related Issue Or Context

Closes: #

How Has This Been Tested? Testing details.

Types of changes

[ ] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to change)
[ ] Documentation

Checklist:

[ ] I have commented my code, particularly in hard-to-understand areas.
[ ] I have ensured that all acceptance criteria (or expected behavior) from issue are met
[ ] I have updated the documentation locally and in sygma-docs.
[ ] I have added tests to cover my changes.
[ ] I have ensured that all the checks are passing and green, I've signed the CLA bot

mpetrunic commented 5 months ago

What's the point of this PR considering we want to merge dev changes with main branch?

You should fork from main branch, merge all dev commits onto that branch and open PR, if everything looks ok, either we will enable merge commits temporarily or I will merge that branch onto main with admin perm

wainola commented 5 months ago

What's the point of this PR considering we want to merge dev changes with main branch?

You should fork from main branch, merge all dev commits onto that branch and open PR, if everything looks ok, either we will enable merge commits temporarily or I will merge that branch onto main with admin perm

I totally misunderstood. I thought we wanted the changes from main into dev and not the other way around. Closing this.

sygmaprotocol / sygma-widget