Display redemptions in my activity #570

r-czajkowski · 2023-07-13T10:34:40Z

This PR adds support for fetching pending/completed redemptions and displaying them under the my activity table on the Bridge page.

Use builder pattern to build the redemption details link. Also keep the `buildRedemptionDetailsLink` function to not break the current API. We need more generic approach to build link because in `RedemptionRequested` evnet we do not have `btcAddress` but `redeemerOutputScript` in expected format. Also in event we can find `walletPublicKeyHash` not `walletPublicKey` - using builder we can build link from `walletPublicKey` or `walletPublicKeyHash` and `btcAddress` or `redeemerOutpuScript` and the builder class is responsible for converting params to correct format.

Take into account requested and completed redemptions to display them in the `my activity` table on the bridge page.

And update the store data based on emitted data.

We should sort from newest to oldest.

github-actions · 2023-07-13T11:07:37Z

Preview uploaded to https://preview.dashboard.test.threshold.network/display-redemptions-in-my-activity/index.html.

github-actions · 2023-07-13T11:27:47Z

Preview uploaded to https://preview.dashboard.test.threshold.network/display-redemptions-in-my-activity/index.html.

michalsmiarowski

Overall looking very good 🔥 Left come comments to look at before the merge though:

src/utils/tBTC.ts

michalsmiarowski · 2023-07-14T06:13:25Z

src/threshold-ts/tbtc/index.ts

 export interface BridgeActivity {
+  bridgeProcess: BridgeProcess


TBH from the UI perspective it's hard to know which one of the transaction from bridge activity is mint and which one is unmint if all of them all pending. For example take a look at my Bridge Activity on testnet:

Just by looking at it I have no clue which one is which (well, except the mint one). Having that much pending transaction on miannet is probably unlikely to happen but who knows. Maybe we could think about some way to improve the readability. WYT @sashatanase @r-czajkowski ?

Maybe instead of PENDING we could display MINTING/UNMINTG ?

Let's update later when we get feedback from the designers.

@sashatanase @SorinQ

src/threshold-ts/tbtc/index.ts

michalsmiarowski · 2023-07-14T06:22:49Z

src/threshold-ts/tbtc/index.ts

+      .sort((a, b) => b.blockNumber - a.blockNumber)
+  }
+
+  private _findDepositActivities = async (


This is just personal opinion so feel free to ignore it but i believe we could name it _findDepositBridgeActivities. When there will be a situation when we go back to this project after some months then I think that name will immedietely indicate what is this method for where using just activities might be confusing. But like I said, just my personal preference. We can keep that up too if you prefer it.

Maybe we should rename to findDepositHistory and findRedemptionHistory?

Also, I think we should get rid of the bridgeActivity from the TBTC interface because it's too specific for the dapp. I think we should fetch this data in hook. I believe we had a conversation about it some time ago.

Yes i agree. The bridgeHistory might work better in our code and it won't be specific to the dApp naming. I'll leave it to you to decide if you want ot change it or not. I also like the names you proposed - findDepositHistory and findRedemptionHistory. We can leavi it for now too if you want and refactor it later.

I would rename/remove it in a separate PR to make sure we do(not) want this method in TBTC interface and deal with it once and for all.

src/threshold-ts/tbtc/index.ts

src/hooks/tbtc/useSubscribeToRedemptionRequestedEvent.ts

michalsmiarowski · 2023-07-14T07:09:44Z

src/store/tbtc/tbtcSlice.ts

+  }
+}
+
+function findRedemptionActivity(


If you agree with #570 (comment) then we might also rename this one to findRedemptionBridgeActivity

List missed params in error message.

Since we now gather both deposit and remption data it seems that `depositor` name for the `bridgeAcivity` parameter doesn't really match and might be misleading. Here we rename param to just `account`.

Use array instead of map. While working on this, I thought getting redemption by key would be useful, but it looks like it's unnecessary now.

github-actions · 2023-07-14T09:53:54Z

Preview uploaded to https://preview.dashboard.test.threshold.network/display-redemptions-in-my-activity/index.html.

Add utils functions that help convert number to token precision.

github-actions · 2023-07-14T10:26:04Z

Preview uploaded to https://preview.dashboard.test.threshold.network/display-redemptions-in-my-activity/index.html.

Point out that `activityKey` stores the redemption key for redemption and deposit key for deposit.

michalsmiarowski

LGTM

michalsmiarowski · 2023-07-14T12:33:57Z

src/hooks/tbtc/useSubscribeToRedemptionRequestedEvent.ts

+          // TODO: Take into account fees, see
+          // https://github.com/threshold-network/token-dashboard/pull/569
+          amount: fromSatoshiToTokenPrecision(requestedAmount).toString(),


Let's not forget about this TODO

github-actions · 2023-07-14T12:43:51Z

Preview uploaded to https://preview.dashboard.test.threshold.network/display-redemptions-in-my-activity/index.html.

There is no need to take into account fees in this case because in the `my activity` table we want to display the tBTC amount that user requested to unmint - they actually decrease their balance of tBTC token by this amount.

michalsmiarowski

LGTM 🚗

github-actions · 2023-07-14T13:10:43Z

Preview uploaded to https://preview.dashboard.test.threshold.network/display-redemptions-in-my-activity/index.html.

r-czajkowski added 2 commits July 13, 2023 11:16

Update the bridgeActivity method in TBTC impl

c7361a2

Take into account requested and completed redemptions to display them in the `my activity` table on the bridge page.

r-czajkowski added 💎 components 📜 contract integration labels Jul 13, 2023

r-czajkowski added this to the v1.9.0 milestone Jul 13, 2023

r-czajkowski requested a review from michalsmiarowski July 13, 2023 10:34

r-czajkowski added 2 commits July 13, 2023 13:05

Subscribe to the RedemptionRequested event

eff211e

And update the store data based on emitted data.

Fix bridge activities sorting

4f374ec

We should sort from newest to oldest.

r-czajkowski mentioned this pull request Jul 13, 2023

tBTC redemption UI support in the Threshold Dashboard #553

Closed

r-czajkowski self-assigned this Jul 13, 2023

michalsmiarowski requested changes Jul 14, 2023

View reviewed changes

r-czajkowski added 3 commits July 14, 2023 10:56

Improve params validation link builder

fb4038f

List missed params in error message.

Rename param in bridgeActivity fn

fd6839a

Since we now gather both deposit and remption data it seems that `depositor` name for the `bridgeAcivity` parameter doesn't really match and might be misleading. Here we rename param to just `account`.

Simplify fn that fetches the redemptions

fecc080

Use array instead of map. While working on this, I thought getting redemption by key would be useful, but it looks like it's unnecessary now.

Add utils fn

fe8b96e

Add utils functions that help convert number to token precision.

r-czajkowski requested a review from michalsmiarowski July 14, 2023 10:17

Add comment in BridgeActivity interface

865587e

Point out that `activityKey` stores the redemption key for redemption and deposit key for deposit.

michalsmiarowski previously approved these changes Jul 14, 2023

View reviewed changes

michalsmiarowski reviewed Jul 14, 2023

View reviewed changes

Remove TODO

434e558

There is no need to take into account fees in this case because in the `my activity` table we want to display the tBTC amount that user requested to unmint - they actually decrease their balance of tBTC token by this amount.

r-czajkowski dismissed michalsmiarowski’s stale review via 434e558 July 14, 2023 12:51

r-czajkowski requested a review from michalsmiarowski July 14, 2023 12:52

michalsmiarowski approved these changes Jul 14, 2023

View reviewed changes

michalsmiarowski merged commit 3dd89f7 into main Jul 14, 2023
5 checks passed

michalsmiarowski deleted the display-redemptions-in-my-activity branch July 14, 2023 13:10

r-czajkowski mentioned this pull request Jul 26, 2023

Mint/Unmint My Activity Card label improvement #578

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display redemptions in my activity #570

Display redemptions in my activity #570

r-czajkowski commented Jul 13, 2023

github-actions bot commented Jul 13, 2023

github-actions bot commented Jul 13, 2023

michalsmiarowski left a comment

michalsmiarowski Jul 14, 2023

r-czajkowski Jul 14, 2023

r-czajkowski Jul 14, 2023

r-czajkowski Jul 25, 2023

michalsmiarowski Jul 14, 2023

r-czajkowski Jul 14, 2023

r-czajkowski Jul 14, 2023

michalsmiarowski Jul 14, 2023

r-czajkowski Jul 14, 2023

michalsmiarowski Jul 14, 2023 •

edited

Loading

github-actions bot commented Jul 14, 2023

github-actions bot commented Jul 14, 2023

michalsmiarowski left a comment

michalsmiarowski Jul 14, 2023

r-czajkowski Jul 14, 2023

github-actions bot commented Jul 14, 2023

michalsmiarowski left a comment

github-actions bot commented Jul 14, 2023

		export interface BridgeActivity {
		bridgeProcess: BridgeProcess

Display redemptions in my activity #570

Display redemptions in my activity #570

Conversation

r-czajkowski commented Jul 13, 2023

github-actions bot commented Jul 13, 2023

github-actions bot commented Jul 13, 2023

michalsmiarowski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michalsmiarowski Jul 14, 2023 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jul 14, 2023

github-actions bot commented Jul 14, 2023

michalsmiarowski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jul 14, 2023

michalsmiarowski left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 14, 2023

michalsmiarowski Jul 14, 2023 •

edited

Loading