Feat/LIVE-12193 track swap cancel accept #6799

andreicovaciu · 2024-05-02T09:42:42Z

✅ Checklist

npx changeset was attached.
Covered by automatic tests.
Impact of the changes:
- ...

📝 Description

Updates custom.exchange.start custom handler to return the device too.

❓ Context

JIRA or GitHub link: https://ledgerhq.atlassian.net/browse/LIVE-12193

🧐 Checklist for the PR Reviewers

The code aligns with the requirements described in the linked JIRA or GitHub issue.
The PR description clearly documents the changes made and explains any technical trade-offs or design decisions.
There are no undocumented trade-offs, technical debt, or maintainability issues.
The PR has been tested thoroughly, and any potential edge cases have been considered and handled.
Any new dependencies have been justified and documented.
Performance considerations have been taken into account. (changes have been profiled or benchmarked if necessary)

vercel · 2024-05-02T09:42:50Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

5 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ledger-live-docs	⬜️ Ignored (Inspect)	Visit Preview	May 13, 2024 9:11am
ledger-live-github-bot	⬜️ Ignored (Inspect)	Visit Preview	May 13, 2024 9:11am
native-ui-storybook	⬜️ Ignored (Inspect)	Visit Preview	May 13, 2024 9:11am
react-ui-storybook	⬜️ Ignored (Inspect)	Visit Preview	May 13, 2024 9:11am
web-tools	⬜️ Ignored (Inspect)	Visit Preview	May 13, 2024 9:11am

kallen-ledger

Nice, looks good to me. Let's wait for the wallet api team to take a look before merging 💪

Justkant

I think we can move the logic from LLD and LLM to LLC and remove the uiHook for device as it doesn't really need ui in your context

apps/ledger-live-desktop/src/renderer/components/WebPTXPlayer/CustomHandlers.ts

libs/ledger-live-common/src/wallet-api/Exchange/server.ts

Justkant

I think we have the main logic good here just on desktop I'd like to modify it a bit to make sure we have a device in the end

libs/ledger-live-common/src/wallet-api/Exchange/server.ts

Justkant · 2024-05-06T14:18:36Z

apps/ledger-live-desktop/src/renderer/components/WebPTXPlayer/CustomHandlers.ts

@@ -57,10 +59,10 @@ export function usePTXCustomHandlers(manifest: WebviewProps["manifest"]) {
                ...exchangeParams,
                exchangeType: ExchangeType[exchangeParams.exchangeType],
                onResult: (nonce: string) => {
-                  onSuccess(nonce);
+                  onSuccess(nonce, device);


Not sure how much it keeps the device in sync here because it will be hoisted when the custom.exchange.start is called it could be the old value

It would probably be better if onResult and onCancel could return the device as it's done for LLM
I checked the code and it seems pretty straightforward to add some data:

Inputs: https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledger-live-common/src/exchange/platform/startExchange.ts#L16

Success: https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledger-live-common/src/exchange/platform/startExchange.ts#L49-L52

Error: https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledger-live-common/src/exchange/platform/startExchange.ts#L62-L65

StartExchange inputs: https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledger-live-common/src/hw/actions/startExchange.ts#L150-L155

startExchange mapResult: https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledger-live-common/src/hw/actions/startExchange.ts#L37-L49

Another solution could be to simply use const device = useSelector(getCurrentDevice); in apps/ledger-live-desktop/src/renderer/components/LiveAppDrawer.tsx because if we do the changes above we might want to update LLM so result.device comes from the action and not a state.

You can also cleanup this types that are not needed anymore

I feel this is a very deep understanding of the code and product to produce such detailed comment. Do you mind sharing any piece of documentation for future use cases? Thank you, @Justkant! 🙌🏽
P.S. I'll update accordingly

Hey not sure we have a lot of documentation on the device actions and exchange part to be honest
I'm pretty familiar with this because I worked on some issues around it

My main concern here is to avoid having to much differences between LLD and LLM and sharing as much as possible, especially because you have a lot of ways to pass the data in the end correctly

ofreyssinet-ledger

LGTM on the device experience team's scope 👍

Justkant

LGTM just some typings cleanup and we are good, good job

apps/ledger-live-desktop/src/renderer/components/LiveAppDrawer.tsx

apps/ledger-live-mobile/src/components/Web3AppWebview/PlatformAPIWebview.tsx

apps/ledger-live-mobile/src/components/Web3AppWebview/helpers.ts

Justkant · 2024-05-13T08:20:19Z

apps/ledger-live-mobile/src/components/WebPTXPlayer/CustomHandlers.ts

+                    onCancel(
+                      result.startExchangeError.error,
+                      result.startExchangeError.device || device,
+                    );
                  }

                  if (result.startExchangeResult) {
                    setDevice(result.device);


We'll have to look at this result.device later on to see how we can remove this and instead use result.startExchangeResult.device

andreicovaciu requested review from a team as code owners May 2, 2024 09:42

github-actions bot assigned andreicovaciu May 2, 2024

live-github-bot bot added desktop Has changes in LLD common Has changes in live-common mobile Has changes in LLM labels May 2, 2024

andreicovaciu added 5 commits May 3, 2024 10:53

feat: send Swap Metadata information to swap live app

cf2cca3

feat: adds custom.device.get as CustomHandler

349e1e3

feat: removes unused props

9f45615

feat: fix lint

d16cad5

feat: updates mobile custom handlers

2e26f0d

andreicovaciu force-pushed the feat/LIVE-12193-track-swap-cancel-accept branch from 5e551b4 to 2e26f0d Compare May 3, 2024 07:54

kallen-ledger previously approved these changes May 3, 2024

View reviewed changes

feat: add changeset

b099b70

andreicovaciu dismissed kallen-ledger’s stale review via b099b70 May 3, 2024 10:38

Justkant reviewed May 3, 2024

View reviewed changes

apps/ledger-live-desktop/src/renderer/components/WebPTXPlayer/CustomHandlers.ts Outdated Show resolved Hide resolved

libs/ledger-live-common/src/wallet-api/Exchange/server.ts Outdated Show resolved Hide resolved

feat: updates based on review

3cbcf90

vercel bot deployed to Preview – web-tools May 6, 2024 12:57 View deployment

andreicovaciu requested a review from Justkant May 6, 2024 12:57

Justkant reviewed May 6, 2024

View reviewed changes

andreicovaciu added 2 commits May 8, 2024 11:02

feat: updates based on review

4e4e276

feat: updates based on review

ffdc09b

andreicovaciu requested review from a team as code owners May 8, 2024 08:04

feat: fix types

6c8cd44

andreicovaciu requested a review from Justkant May 8, 2024 08:06

andreicovaciu added 3 commits May 8, 2024 11:28

feat: fix mobile implementation

d68fbea

feat: fix mobile onResult types

b4543d1

feat: fix PlatformAPIWebview

32560e2

feat: fix lint

8fca0f8

kallen-ledger previously approved these changes May 9, 2024

View reviewed changes

gre previously approved these changes May 10, 2024

View reviewed changes

ofreyssinet-ledger previously approved these changes May 13, 2024

View reviewed changes

Justkant reviewed May 13, 2024

View reviewed changes

feat: infer types

11c839e

andreicovaciu dismissed stale reviews from ofreyssinet-ledger, gre, and kallen-ledger via 11c839e May 13, 2024 09:10

andreicovaciu requested review from Justkant, gre, ofreyssinet-ledger and kallen-ledger May 13, 2024 09:10

Justkant approved these changes May 13, 2024

View reviewed changes

Justkant merged commit 5b18e6a into develop May 13, 2024
58 checks passed

Justkant deleted the feat/LIVE-12193-track-swap-cancel-accept branch May 13, 2024 13:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/LIVE-12193 track swap cancel accept #6799

Feat/LIVE-12193 track swap cancel accept #6799

andreicovaciu commented May 2, 2024 •

edited

vercel bot commented May 2, 2024 •

edited

kallen-ledger left a comment

Justkant left a comment

Justkant left a comment

Justkant May 6, 2024

andreicovaciu May 6, 2024

Justkant May 7, 2024

andreicovaciu May 8, 2024

ofreyssinet-ledger left a comment

Justkant left a comment

Justkant May 13, 2024

Feat/LIVE-12193 track swap cancel accept #6799

Feat/LIVE-12193 track swap cancel accept #6799

Conversation

andreicovaciu commented May 2, 2024 • edited

✅ Checklist

📝 Description

❓ Context

🧐 Checklist for the PR Reviewers

vercel bot commented May 2, 2024 • edited

kallen-ledger left a comment

Choose a reason for hiding this comment

Justkant left a comment

Choose a reason for hiding this comment

Justkant left a comment

Choose a reason for hiding this comment

Justkant May 6, 2024

Choose a reason for hiding this comment

andreicovaciu May 6, 2024

Choose a reason for hiding this comment

Justkant May 7, 2024

Choose a reason for hiding this comment

andreicovaciu May 8, 2024

Choose a reason for hiding this comment

ofreyssinet-ledger left a comment

Choose a reason for hiding this comment

Justkant left a comment

Choose a reason for hiding this comment

Justkant May 13, 2024

Choose a reason for hiding this comment

andreicovaciu commented May 2, 2024 •

edited

vercel bot commented May 2, 2024 •

edited