Claimables [PR #2]: claim panel ui #6141

benisgold · 2024-09-25T16:24:55Z

Fixes APP-####

What changed (plus any additional context for devs)

adds claim panel ui

ui states:
idle- initial state
claiming- immediately after user clicks claim
success- claim function has been completed and we DO have proof (tx hash) that the claim occurred on chain (applies to all transaction type & some sponsored type claimables)
pending- claim function has been completed and we DO NOT have proof (tx hash) that the claim occurred on chain (applies to some sponsored type claimables)
error- claim function failed, user is given the opportunity to retry. in the future, retry may not be possible due to partial rap execution

in terms of functionality, you can expect to "initiate" a claim but it will stay stuck in "claiming" status bc there's no actual claim logic. the claim button will then be disabled

figma: https://www.figma.com/design/BqH9Y7pC6zOjO3UrwTBTbL/claimables?node-id=349-5633&m=dev

Screen recordings / screenshots

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-09-25.at.20.18.49.mp4

What to test

nothing yet

…ithub.com/rainbow-me/rainbow into @benisgold/raps

brunobar79 · 2024-09-26T01:26:44Z

Launch in simulator or device for 6ce5a27

brunobar79 · 2024-09-26T16:10:38Z

Launch in simulator or device for e395fd5

…ithub.com/rainbow-me/rainbow into @benisgold/claim-panel-ui

…ithub.com/rainbow-me/rainbow into @benisgold/raps

… into @benisgold/claim-panel-ui

src/components/asset-list/RecyclerAssetList2/Claimable.tsx

greg-schrammel · 2024-09-27T20:23:01Z

src/screens/claimables/ClaimingClaimableSharedUI.tsx

+export type ClaimStatus =
+  | 'idle' // initial state
+  | 'claiming' // user has pressed the claim button
+  | 'pending' // claim has been submitted but we don't have a tx hash
+  | 'success' // claim has been submitted and we have a tx hash
+  | 'error'; // claim has failed


I get what it is because of the comments but can't we have the status itself say better what it is without the need to explain in comments?

i think it's clear enough tbh

src/screens/claimables/ClaimingTransactionClaimable.tsx

src/screens/claimables/ClaimingSponsoredClaimable.tsx

src/screens/claimables/ClaimingTransactionClaimable.tsx

walmat

Couple small comments. Going to approve prematurely to unblock you.

…@benisgold/raps

… into @benisgold/claim-panel-ui

sentry-io · 2024-10-02T14:37:52Z

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

‼️ TypeError: Cannot read property 'maxBaseFee' of undefined exports.parseGasParamsForTransaction(src/parser... View Issue
‼️ Error: [ClaimingTransactionClaimable]: Failed to estimate gas limit _callSuper(src/logger/index) View Issue

_{Did you find this useful? React with a 👍 or 👎}

* raps * nit * comments * nit * nit * prettier * updates to query, types, & wallet screen components * rm onPress * rm logic * claim panel ui * nav * onPress -> onLongPress * i18n * pending state, i18n * comment * shimmer * tweak gas fee formatting * number formatting * wallet screen number format * route types * do not require long press for goBack * tweak button text * nit * formatting * thanks greg * revert * fix android button width * rm memo * try catch gas * rm functionality from tx * rm rapsv2

* sortDirection * asc/desc menu * imports * imports * i18n * Merge remote-tracking branch origin/develop into gregs/app-1756-sorting-nfts-on-android-is-broken * Merge remote-tracking branch origin/develop into gregs/app-1756-sorting-nfts-on-android-is-broken * fix types * update ts * add back isAnchoredToRight * ?? * grey out the selected option * android * Fix iOS 18 cool-modals context menu bug (#6112) * Fix send crashes / blank screen (#6116) * Fix disabled paste button on Android (#6118) * imageVariants (#6114) * Fix send sheet stuck on loading (#6119) * fix stuck loading phase * Update src/screens/SendSheet.js * fix deleting contact resetting toAddress to undefined * fix some shit with ens names * rm logs * fix failed to send * fix lint * prefer contact name over wallet label * force linter 2 re-rerun --------- Co-authored-by: Bruno Barbieri <[email protected]> * Support typing into native inputs in swap (#6100) * Remove unused TODO as build quote params should always rely on the corresponding input output amounts even if native values are updated * Support input native changes in swap inputs controller animated reaction * Temp cleanup on SwapInputAsset to pull out SwapInputAmountCaret and SwapInputNativeAmount * Temp cleanup on SwapOutputAsset to pull out SwapOutputAmountCaret and SwapOutputNativeAmount * Placeholder: generic SwapInputValuesCaret that still need to be hooked up with native inputs * Add caret animatedStyle to SwapInputValuesCaret * Use SwapInputValuesCaret component in SwapInputAsset and SwapOutputAsset * Remove old input and output caret styles from useSwapTextStyles * Cleanup of unused imports in swaps types * Add assetToSellCaretStyle and assetToBuyCaretStyle to caret component * Remove now unused assetToSell/BuyCaretStyles from useAnimatedSwapStyles * Update native input in SwapInputAsset to be typeable * Define size style for native caret in SwapInputValuesCaret * Update swap number pad Remove formatting that isn't a decimal or number on inputs. Previously, we were removing only commas, but now that we support native inputs, we want to remove the native currency symbols. Prevent updating of the native inputs if their is no corresponding price for the input / output asset. * Create separate SwapNativeInput component * Remove unused caret styles from SwapInputAsset and SwapOutputAsset * Add param to ignore alignment for native currency formatting and add handler for basic currency formatting * Update width on nativeCaret * Add support for changes to native output value * Fix missing checks for inputNativeValue and outputNativeValue * Split native currency symbol from value in native input component * Disable caret when correponding asset does not have price for native input * Update formatting for input amount if input method is native inputs * Disable pointer events when no price on native inputs * Distinguish between placeholder values vs typed inputs for native input values * Update checks for color for zero value in swap text styles * Disable focus and pointer events on native output if output based quotes disabled * Support showing explainer if output quotes disabled and user tries to update output native amount * Ignore native input changes if native currency decimals exceeded * Update add decimal in swap number pad to also handle scenarios where there are no native currency decimals * Update South Korea and Japan currencies as they do not use decimals * Fix numbers test after JPY decimal changes * Update numbers test value which should get rounded up * Fix: check for native placeholder value while checking native input decimal places * Fix chainId not being passed in for dapp browser getProvider function (#6121) * Update rainbow provider package to latest 0.1.1 * Fix: getProvider function needs to use an object param * Cleanup * Update arbitrum default back to mainnet for WC message signing (#6122) * Bump deps for Xcode 16 compatibility (#6110) * RN upgrade * update ios files * fixes for android * iOS working fine * bump sentry again * patches and missing dep bump * bump more deps * update lockfile * fix android * changes to pbxproj * revert RN upgrade * new line missing * force linter 2 re-rerun * update pod lock * bump iOS and Android to v1.9.40 (#6131) * Update CI to work with Xcode 16 / iOS 18 (#6129) * omit_from_total (#6103) * Fix speed up and cancel bug (#6133) * change txTo -> to * idk * bump iOS and Android to v1.9.41 (#6136) * MWP (#6142) * mwp compat * prettier * log only if there is an error * Dapp browser url updates fix (#6150) * remove unused import * restrict JS nav from SPA to same domain * clean up * Update src/components/DappBrowser/BrowserTab.tsx * Internal networks filtering (#6148) * filter internal networks out * rm apechains refs * Fix token search crash for newly added chains (#6147) * fix token search crash * rm assets * Claimables [PR #1]: updates to query, types, utils, wallet screen rendering logic + wallet screen components (#6140) * updates to query, types, & wallet screen components * rm onPress * thanks greg * Fix improper gas fee calculation (#6125) * add missing mul to eip1559 * use preferred network if available * another NaN check guard * Claimables [PR #2]: claim panel ui (#6141) * raps * nit * comments * nit * nit * prettier * updates to query, types, & wallet screen components * rm onPress * rm logic * claim panel ui * nav * onPress -> onLongPress * i18n * pending state, i18n * comment * shimmer * tweak gas fee formatting * number formatting * wallet screen number format * route types * do not require long press for goBack * tweak button text * nit * formatting * thanks greg * revert * fix android button width * rm memo * try catch gas * rm functionality from tx * rm rapsv2 * raps v2 (#6138) * raps * nit * comments * nit * nit * prettier * updates to query, types, & wallet screen components * rm onPress * rm logic * thanks greg * Claimables [PR #3]: claim functionality (#6146) * raps * nit * comments * nit * nit * prettier * updates to query, types, & wallet screen components * rm onPress * rm logic * claim panel ui * nav * onPress -> onLongPress * i18n * pending state, i18n * comment * shimmer * functionality * tweak gas fee formatting * number formatting * wallet screen number format * route types * set pending state if no tx hash * do not require long press for goBack * tweak button text * nit * fix pending tx * disable read only wallet * formatting * thanks greg * revert * fix android button width * rm memo * try catch gas * rm functionality from tx * [APP-1907] Add Claiming Status to Pending Claimable TX's (plus types and unused code cleanup) (#6155) * fix: use claim type for pending claimable tx * [APP-1909] Await Claimable TX Before Resolving Rap (#6156) * fix: await claimable tx mining before displaying success * fix: add pending tx prior to waiting for mining * Claimables fixes (#6158) * number formatting * fix border radius for claim dapp icon * poll gas by chain id * haptics * adjust button enabled logic + shadows * fix (#6159) * convert sends to typescript (#6120) * convert sends to typescript * more conversions * fix lint * fix optimism security fee * fix file renaming weirdness * fix rotation from max asset to nft not working * fix some typescript bs * fix lint * fix nft sends * comments watchdog action (#6153) * pod unlock (#6168) * Fix WalletconnectV2 changeAccount issues (#6160) * fix wc v2 change account issues * Update src/walletConnect/index.tsx * Update src/components/walletconnect-list/WalletConnectV2ListItem.tsx * Update src/components/walletconnect-list/WalletConnectV2ListItem.tsx * fix deps array * bump android and iOS to version v1.9.42 (#6170) * fix approval sheet not using verifiedData incoming from walletconnect (#6162) * network expansion (#6149) * init apechain support * fix wrong images * Apply suggestions from code review * Update chain badge * Update chain colors * Add all badge assets * add backend networks runtime * added back internal flag * remove unused NATIVE_ASSETS_PER_CHAIN * fix some discrepancies --------- Co-authored-by: Christian Baroni <[email protected]> * Analytics changes (#6169) * analytics changes * idk * watched wallets cohort + properly track watched wallets * [CHORE]: Walletconnect Approval / Redirect sheet typescript conversion (#6167) * wc ts conversion * remove memo and fix lint * nft expanded state fix crash (#6115) * fix crash * destructure in same line * fix lint issues on develop (#6174) * Fix MWP from failing to prompt if dapp metadata retrieval fails (#6164) * prevent mwp flow from failing if failed to fetch dapp metadata * prevent logging user rejections * ignore logging some user errors * lel wtf (#6166) * WC migration to WalletKit (#6163) * Fix networks crash (#6176) * fix networks crash * remove duplicated walletconnect chain ids * use all supported chains for walletconnect * fix weird space on approval sheet * Update src/screens/WalletConnectApprovalSheet.tsx * hide send button when not transferable (#6123) * Claim button fixes (#6165) * hold -> tap * debounce * fix lint (#6180) * chore: use new fields from swap sdk and remove extraneous code (#6171) * chore: update swaps * chore: replace extraneous crosschain logic with needsAllowance field * chore: get rid of all WRAPPED_ASSET references and use quote swap type * chore: remove swapType as a param to get quotes * chore: replace swap unlock logic with needsAllowance field * chore: code review changes * Zeego Dropdown Menus [MintFilters] (#6143) * zeego setup * bump react-native-menu/menu * fix android settings menu * update deps * fix type inference * mvp to fix android context menus * fix some inconsistencies on Android * remove debug logs * Update src/components/asset-list/RecyclerAssetList2/core/RawRecyclerList.tsx * Update src/components/DropdownMenu.tsx * remove unused deps * fix build maybe * update lock * Claim bug fix (#6182) * fixes * fix experimental config usage * nits * use setTimeout * defaultConfig fix * fix ledger image blocking text * 👍 * lint * lint --------- Co-authored-by: Christian Baroni <[email protected]> Co-authored-by: Matthew Wall <[email protected]> Co-authored-by: Bruno Barbieri <[email protected]> Co-authored-by: Jin <[email protected]> Co-authored-by: Bruno Barbieri <[email protected]> Co-authored-by: Ibrahim Taveras <[email protected]> Co-authored-by: Ben Goldberg <[email protected]> Co-authored-by: Christopher Howard <[email protected]> Co-authored-by: Wayne Cheng <[email protected]>

benisgold added 17 commits September 24, 2024 16:09

raps

382c49d

nit

d4dd19b

comments

3d8d9d1

nit

c268875

nit

9beb669

prettier

8d7b65b

updates to query, types, & wallet screen components

d6d69ce

rm onPress

112fd07

Merge branch '@benisgold/claimables-wallet-screen-fixes' of https://g…

d624f5c

…ithub.com/rainbow-me/rainbow into @benisgold/raps

rm logic

2226d95

claim panel ui

72df248

nav

4614748

onPress -> onLongPress

82fa2fc

i18n

9d15e2d

pending state, i18n

b2fe4e9

comment

519b1ce

shimmer

d8c84b1

benisgold requested review from christianbaroni and walmat September 26, 2024 00:23

benisgold marked this pull request as ready for review September 26, 2024 00:27

benisgold added 3 commits September 26, 2024 09:01

tweak gas fee formatting

97241dc

number formatting

46e86ac

wallet screen number format

81573c0

benisgold changed the title ~~Claimables: claim panel ui~~ Claimables [PR #2]: claim panel ui Sep 26, 2024

benisgold added 4 commits September 26, 2024 10:22

route types

bd0e1b9

do not require long press for goBack

567bae1

tweak button text

a14612d

nit

066569c

benisgold requested review from greg-schrammel and removed request for christianbaroni September 27, 2024 15:43

Merge branch '@benisgold/claimables-wallet-screen-fixes' of https://g…

cddc706

…ithub.com/rainbow-me/rainbow into @benisgold/claim-panel-ui

benisgold changed the base branch from @benisgold/claimables-wallet-screen-fixes to @benisgold/raps September 27, 2024 16:38

benisgold added 4 commits September 27, 2024 12:39

Merge branch '@benisgold/claimables-wallet-screen-fixes' of https://g…

8b64245

…ithub.com/rainbow-me/rainbow into @benisgold/raps

revert

6c954b3

Merge branch '@benisgold/raps' of https://github.com/rainbow-me/rainbow…

8f75015

… into @benisgold/claim-panel-ui

fix android button width

460601e

greg-schrammel reviewed Sep 27, 2024

View reviewed changes

src/components/asset-list/RecyclerAssetList2/Claimable.tsx Show resolved Hide resolved

greg-schrammel reviewed Sep 27, 2024

View reviewed changes

rm memo

1bedad2

walmat reviewed Sep 30, 2024

View reviewed changes

src/screens/claimables/ClaimingTransactionClaimable.tsx Outdated Show resolved Hide resolved

walmat reviewed Sep 30, 2024

View reviewed changes

src/screens/claimables/ClaimingSponsoredClaimable.tsx Show resolved Hide resolved

walmat reviewed Sep 30, 2024

View reviewed changes

src/screens/claimables/ClaimingTransactionClaimable.tsx Show resolved Hide resolved

walmat reviewed Sep 30, 2024

View reviewed changes

src/screens/claimables/ClaimingTransactionClaimable.tsx Outdated Show resolved Hide resolved

walmat approved these changes Sep 30, 2024

View reviewed changes

benisgold added 4 commits September 30, 2024 13:27

try catch gas

34046f1

rm functionality from tx

45a9552

Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …

198310c

…@benisgold/raps

Merge branch '@benisgold/raps' of https://github.com/rainbow-me/rainbow…

529e513

… into @benisgold/claim-panel-ui

benisgold changed the base branch from @benisgold/raps to develop September 30, 2024 18:25

benisgold changed the base branch from develop to @benisgold/raps September 30, 2024 18:26

rm rapsv2

6bdf0f2

benisgold changed the base branch from @benisgold/raps to develop September 30, 2024 18:28

greg-schrammel approved these changes Sep 30, 2024

View reviewed changes

benisgold merged commit 1256c85 into develop Oct 1, 2024
6 checks passed

benisgold deleted the @benisgold/claim-panel-ui branch October 1, 2024 12:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Claimables [PR #2]: claim panel ui #6141

Claimables [PR #2]: claim panel ui #6141

benisgold commented Sep 25, 2024 •

edited

Loading

brunobar79 commented Sep 26, 2024

brunobar79 commented Sep 26, 2024

greg-schrammel Sep 27, 2024

benisgold Sep 30, 2024

walmat left a comment

sentry-io bot commented Oct 2, 2024 •

edited

Loading

Claimables [PR #2]: claim panel ui #6141

Claimables [PR #2]: claim panel ui #6141

Conversation

benisgold commented Sep 25, 2024 • edited Loading

What changed (plus any additional context for devs)

Screen recordings / screenshots

What to test

brunobar79 commented Sep 26, 2024

brunobar79 commented Sep 26, 2024

greg-schrammel Sep 27, 2024

Choose a reason for hiding this comment

benisgold Sep 30, 2024

Choose a reason for hiding this comment

walmat left a comment

Choose a reason for hiding this comment

sentry-io bot commented Oct 2, 2024 • edited Loading

Suspect Issues

benisgold commented Sep 25, 2024 •

edited

Loading

sentry-io bot commented Oct 2, 2024 •

edited

Loading