fix(conflict): resolve merge conflict

* fix(already-cancelled-sub): UI should allow restoring subscription

* restore functionality fixed

* fix

Co-authored-by: Vikhyath Mondreti <[email protected]>
Co-authored-by: Siddharth Ganesan <[email protected]>

Author: 3 people