Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(earn): cross chain swap and deposit changes on deposit entrypoint #6390

Merged
merged 3 commits into from
Jan 2, 2025

Conversation

satish-ravi
Copy link
Contributor

Description

Figma

Test plan

Unit tests, manual

Updated swap & deposit option and description:

Related issues

Backwards compatibility

Yes

Network scalability

N/A

Copy link

codecov bot commented Dec 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.05%. Comparing base (8d74b49) to head (ae19b2b).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #6390      +/-   ##
==========================================
- Coverage   89.05%   89.05%   -0.01%     
==========================================
  Files         735      735              
  Lines       31350    31368      +18     
  Branches     5820     5529     -291     
==========================================
+ Hits        27919    27934      +15     
- Misses       3237     3388     +151     
+ Partials      194       46     -148     
Files with missing lines Coverage Δ
...c/earn/poolInfoScreen/BeforeDepositBottomSheet.tsx 100.00% <100.00%> (ø)

... and 66 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8d74b49...ae19b2b. Read the comment docs.

"beforeYouCanDepositTitle": "Before you can deposit...",
"beforeYouCanDepositDescription": "You’ll need to add one of the pool tokens. Once added, you’ll need to return to complete your pool deposit.",
"beforeYouCanDepositDescriptionV1_101": "You’ll need to add {{tokenSymbol}} on {{tokenNetwork}}. Once added, you’ll need to return to complete your pool deposit.",
"action": {
"swapAndDeposit": "Swap & Deposit",
"swapAndDepositDescription": "Choose any token on {{tokenNetwork}}. We’ll swap and deposit it simultaneously for you.",
"swapAndDepositAllTokensDescription": "Choose any token\u2014we’ll swap and deposit it simultaneously for you.",
Copy link
Collaborator

@MuckT MuckT Dec 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we use \u2014 instead of ? I couldn't find another instance of unicode characters in the translation files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought it was copying the regular dash originally, - and looked the same in the monospace font from a quick look 😄 . I updated it now to directly use the dash

Copy link

emerge-tools bot commented Jan 2, 2025

📸 Snapshot Test

No snapshots generated

Name Added Removed Modified Unchanged Errored Approval
Celo (test)
org.celo.mobile.test
0 0 0 0 0 N/A

🛸 Powered by Emerge Tools

StatsigFeatureGates.ALLOW_CROSS_CHAIN_SWAP_AND_DEPOSIT
)

const { canSwapDeposit, showCrossChainSwap, showSwap, showAdd, showAddMore, showTransfer } =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙏 beautiful

@satish-ravi satish-ravi added this pull request to the merge queue Jan 2, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 2, 2025
@satish-ravi satish-ravi added this pull request to the merge queue Jan 2, 2025
Merged via the queue into main with commit 3305182 Jan 2, 2025
16 checks passed
github-merge-queue bot pushed a commit that referenced this pull request Jan 2, 2025
#6390)

### Description


[Figma](https://www.figma.com/design/E1rC3MG74qEg5V4tvbeUnU/Earn?node-id=8418-38843&t=JGtN2YLsGFMZeYcS-0)

### Test plan

Unit tests, manual

Updated swap & deposit option and description:

<img
src="https://github.com/user-attachments/assets/1f376276-c557-49a8-bdc2-6e9b37ae0346"
width="250" />

<img
src="https://github.com/user-attachments/assets/aabee4fa-bfd1-4ff6-a6f9-6605c396cff0"
width="250" />

<img
src="https://github.com/user-attachments/assets/98316847-0f83-4c2b-bf4b-ad51b0c71edd"
width="250" />




### Related issues

- Part of ACT-1507

### Backwards compatibility

Yes

### Network scalability

N/A
@satish-ravi satish-ravi deleted the satish/act-1507-deposit-entrypoint-updates branch January 2, 2025 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants