Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:rainbow-me/rainbow into develop
Browse files Browse the repository at this point in the history
* 'develop' of github.com:rainbow-me/rainbow:
  Bump Rudderstack version to v1.12.1 (#5556)
  txs: detail sheet updates (#5535)
  browser: requests background color (#5562)
  fix: hide favs on non mainnet assets (#5565)
  balances: fetch twice tx confirm (#5551)
  [CHORE]: Remove Apollo client in favor of `@/graphql` (#5555)
  browser: favorites state + menu (#5553)
  init browser state (#5552)
  Dapp Browser: Search UI (#5542)
  Dapp Browser + provider (#5543)
  NFT offers/mints gas estimation improvements (#5448)
  State dump modifications (#5382)
  fix crash (#5544)
  [SWAPS V2]: Adjust asset types + utils to match BX (#5538)
  • Loading branch information
BrodyHughes committed Mar 27, 2024
2 parents 172474c + 35feb5b commit 97c83ef
Show file tree
Hide file tree
Showing 77 changed files with 3,288 additions and 93,861 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ coverage
.zed/

# Webpack
src/browser/InjectedJSBundle.js.LICENSE.txt
InjectedJSBundle.js.LICENSE.txt
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ rainbow-scripts
.vscode
__generated__
coverage
InjectedJSBundle.js
InjectedJSBundle.js

0 comments on commit 97c83ef

Please sign in to comment.