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.

Sign up for GitHub

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

Jump to bottom

fix dynamic island overlap on recieve modal #5672

Merged
merged 9 commits into from
May 29, 2024
Merged

fix dynamic island overlap on recieve modal #5672

merged 9 commits into from
May 29, 2024

Conversation

BrodyHughes
Copy link
Member

@BrodyHughes BrodyHughes commented Apr 26, 2024 •
edited
Loading

Fixes APP-950

What changed (plus any additional context for devs)

  • moved to SimpleSheet and changed the route to use similar route settings that we use for other sheets

Screen recordings / screenshots

Before:
Screenshot 2024-04-26 at 12 39 18 PM
After:

Screen.Recording.2024-04-26.at.1.07.33.PM.mov

@BrodyHughes BrodyHughes changed the title qr sheet fix dynamic island overlap on recieve modal Apr 26, 2024
@linear Linear
Copy link

linear bot commented Apr 26, 2024

APP-950 iOS iPhone 15 dynamic island issue with the mobile QR scanner

@BrodyHughes BrodyHughes marked this pull request as ready for review April 26, 2024 18:11
@BrodyHughes BrodyHughes requested a review from walmat April 26, 2024 18:11
walmat
walmat reviewed Apr 26, 2024
View reviewed changes
src/screens/ReceiveModal.js Outdated Show resolved Hide resolved
walmat
walmat reviewed Apr 26, 2024
View reviewed changes
src/screens/ReceiveModal.js Outdated Show resolved Hide resolved
@BrodyHughes
Merge branch 'develop' of github.com:rainbow-me/rainbow into brody/fi…
948f430 
…x-qr-code-sheet

* 'develop' of github.com:rainbow-me/rainbow: (56 commits)
  review panel fixes (#5747)
  Account for NaN values on sliderPosition (#5741)
  add myself to CO for PR approvals (#5743)
  bump version to v1.9.24 (#5742)
  Asset Prices (#5724)
  rm references to old redux swaps const (#5740)
  Swap Warning / Price Impact component (#5722)
  add animated coin icons and text fallbacks (#5733)
  adds ability to select a different output chain id (#5727)
  fix (#5738)
  fix positions calling without address (#5729)
  disable button (#5725)
  Browser: homepage empty state, search logic fixes (#5737)
  Add privacy manifest (#5736)
  swaps and bridge checks on control panel (#5735)
  Browser: fix control panel crash (#5734)
  Browser: control panel fixes (#5730)
  f skylar (#5732)
  fix account switching (#5726)
  Browser: release fixes (#5721)
  ...
@BrodyHughes
.
b32149e
@BrodyHughes BrodyHughes requested a review from walmat May 23, 2024 20:30
walmat
walmat approved these changes May 23, 2024
View reviewed changes
Copy link
Contributor

@walmat walmat left a comment

Choose a reason for hiding this comment

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

smol ting but otherwise 🔥

@walmat walmat merged commit c2bea4f into develop May 29, 2024
6 checks passed
@walmat walmat deleted the brody/fix-qr-code-sheet branch May 29, 2024 18:02
greg-schrammel pushed a commit that referenced this pull request May 29, 2024
@BrodyHughes @greg-schrammel
fix dynamic island overlap on recieve modal (#5672)
251f247 
* .

* oop

* oop

* okay ty ben

* change background opacity to 1

* .

* oop

* .
greg-schrammel added a commit that referenced this pull request Jun 14, 2024
@greg-schrammel @walmat
@brunobar79 @BrodyHughes @benisgold
swap button states (#5785)
fc0ff05 
* wip

* fix gesture button states

* Safemath pt 2 (#5778)

* add more fns

* accept string or number

* update errors

* fix dynamic island overlap on recieve modal (#5672)

* .

* oop

* oop

* okay ty ben

* change background opacity to 1

* .

* oop

* .

* Gas optimizations (#5779)

* perf

* ✨

* useWhyDidYouUpdate

* EstimatedSwapGasFee

* keepPreviousData

* AnimatedText

* isSameAddress

* fix other networks section (#5784)

* Swaps: fix favorite button press (#5782)

* fix

* android fix

* todo

* remove console logs

* Insufficient Funds

* remove todo

* move cache getter closer to fetcher implentation

* fix

* :)

* 🍕

* or equal 🤌

* remove unused isSameAddress util

* just reordering declarations

* error i18n

* useGasSharedValues

* remove estimating

* fix label flickering

* fix review panel not prompting

* Revert "Lint on pre-commit (#5836)"

This reverts commit d56ed46.

* fix a bunch of shit

---------

Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>
Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>
Co-authored-by: brdy <41711440+BrodyHughes@users.noreply.github.com>
Co-authored-by: Ben Goldberg <bengoldberg@rainbow.me>
brunobar79 added a commit that referenced this pull request Jun 21, 2024
@walmat @greg-schrammel
@brunobar79 @BrodyHughes @benisgold @jinchung
Review button states (#5854)
56abcd6 
* wip

* fix gesture button states

* Safemath pt 2 (#5778)

* add more fns

* accept string or number

* update errors

* fix dynamic island overlap on recieve modal (#5672)

* .

* oop

* oop

* okay ty ben

* change background opacity to 1

* .

* oop

* .

* Gas optimizations (#5779)

* perf

* ✨

* useWhyDidYouUpdate

* EstimatedSwapGasFee

* keepPreviousData

* AnimatedText

* isSameAddress

* fix other networks section (#5784)

* Swaps: fix favorite button press (#5782)

* fix

* android fix

* todo

* remove console logs

* Insufficient Funds

* remove todo

* move cache getter closer to fetcher implentation

* fix

* :)

* 🍕

* or equal 🤌

* remove unused isSameAddress util

* just reordering declarations

* error i18n

* useGasSharedValues

* remove estimating

* fix label flickering

* fix review panel not prompting

* Revert "Lint on pre-commit (#5836)"

This reverts commit d56ed46.

* fix a bunch of shit

* fix?

* opacity

* on review panel we should show fetching status and quote errors too

* remove error

* useUserNativeNetworkAsset

* less or equal

* Fixes for review button states (#5873)

* Fixes APP-1601: adds missing useThreshold for gas fee showing $0.00

* Tweak confirm button prop labels logic and ordering

* Prep work: remove reliance of asset balance display in valueBasedDecimalFormatter

* niceIncrementerFormatter returns asset balance if max swap

* Update formattedInputValue

Instead of using the niceIncrementFormatter for formatting slider-based
values:
for max: use the valueBasedDecimalFormatter on the input value which has
already been set to maxSwappableAmount
for everything else: add commas to the input value as it has already been
formatted using the niceIncrementFormatter

* Fixup: missed spot for previous hasEnoughFundsForGas revert

* fix formatting

---------

Co-authored-by: gregs <ukfaeku@gmail.com>
Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>
Co-authored-by: brdy <41711440+BrodyHughes@users.noreply.github.com>
Co-authored-by: Ben Goldberg <bengoldberg@rainbow.me>
Co-authored-by: Jin <jin.chung17@gmail.com>
Co-authored-by: Bruno Barbieri <brunobar79@gmail.com>
jinchung added a commit that referenced this pull request Jun 22, 2024
@benisgold @greg-schrammel
@walmat @brunobar79 @BrodyHughes @jinchung
Swaps: Gas fee range to use for native asset maxSwappableAmount buffer (
a5087f2 
#5881)

* wip

* fix gesture button states

* Safemath pt 2 (#5778)

* add more fns

* accept string or number

* update errors

* fix dynamic island overlap on recieve modal (#5672)

* .

* oop

* oop

* okay ty ben

* change background opacity to 1

* .

* oop

* .

* Gas optimizations (#5779)

* perf

* ✨

* useWhyDidYouUpdate

* EstimatedSwapGasFee

* keepPreviousData

* AnimatedText

* isSameAddress

* fix other networks section (#5784)

* Swaps: fix favorite button press (#5782)

* fix

* android fix

* todo

* remove console logs

* Insufficient Funds

* remove todo

* move cache getter closer to fetcher implentation

* fix

* :)

* 🍕

* or equal 🤌

* remove unused isSameAddress util

* just reordering declarations

* error i18n

* useGasSharedValues

* remove estimating

* fix label flickering

* fix review panel not prompting

* Revert "Lint on pre-commit (#5836)"

This reverts commit d56ed46.

* fix a bunch of shit

* fix?

* opacity

* on review panel we should show fetching status and quote errors too

* remove error

* useUserNativeNetworkAsset

* less or equal

* gas fee range

* fixes

* Fixes for review button states (#5873)

* Fixes APP-1601: adds missing useThreshold for gas fee showing $0.00

* Tweak confirm button prop labels logic and ordering

* Prep work: remove reliance of asset balance display in valueBasedDecimalFormatter

* niceIncrementerFormatter returns asset balance if max swap

* Update formattedInputValue

Instead of using the niceIncrementFormatter for formatting slider-based
values:
for max: use the valueBasedDecimalFormatter on the input value which has
already been set to maxSwappableAmount
for everything else: add commas to the input value as it has already been
formatted using the niceIncrementFormatter

* merge

* weird issues

* fixes

* fix out of sync issue

* update input amount + quote when maxSwappableAmount changes

* fix input formatting logic

* fix wei conversion

---------

Co-authored-by: gregs <ukfaeku@gmail.com>
Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>
Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>
Co-authored-by: brdy <41711440+BrodyHughes@users.noreply.github.com>
Co-authored-by: Jin <jin.chung17@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikedemarais mikedemarais mikedemarais left review comments

@walmat walmat walmat approved these changes

@skylarbarrera skylarbarrera Awaiting requested review from skylarbarrera

@benisgold benisgold Awaiting requested review from benisgold benisgold is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@BrodyHughes @mikedemarais @walmat