Skip to content

Commit

Permalink
Merge branch 'main' into fix/trade-token-selection
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagofilipenunes committed Jul 16, 2024
2 parents 5854b73 + cfada36 commit d28e5d0
Show file tree
Hide file tree
Showing 11 changed files with 321 additions and 149 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@ethersproject/providers": "^5.7.1",
"@floating-ui/react": "^0.25.4",
"@playwright/test": "^1.43.1",
"@sentry/react": "^7.48.0",
"@sentry/vite-plugin": "^0.7.2",
"@sentry/react": "^8.17.0",
"@sentry/vite-plugin": "^2.21.1",
"@tanstack/react-query": "^5.40.1",
"@tanstack/react-query-devtools": "^5.40.1",
"@tanstack/react-router": "^1.4.9",
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'global-shim';
import 'init-sentry';
import React from 'react';
import ReactDOM from 'react-dom/client';
import reportWebVitals from 'reportWebVitals';
Expand All @@ -8,6 +7,7 @@ import { WagmiReactWrapper } from 'libs/wagmi';
import { LazyMotion } from 'libs/motion';
import { QueryProvider } from 'libs/queries';
import { RouterProvider, router } from 'libs/routing';
import 'init-sentry';
import 'utils/buffer';
import 'fonts.css';
import 'index.css';
Expand Down
7 changes: 6 additions & 1 deletion src/init-sentry.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import * as Sentry from '@sentry/react';
import config from 'config';
import { router } from 'libs/routing';

if (config.sentryDSN) {
Sentry.init({
dsn: config.sentryDSN,
integrations: [new Sentry.BrowserTracing(), new Sentry.Replay()],
integrations: [
Sentry.tanstackRouterBrowserTracingIntegration(router),
Sentry.replayIntegration(),
Sentry.captureConsoleIntegration(),
],
// Performance Monitoring
tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
// Session Replay
Expand Down
3 changes: 0 additions & 3 deletions src/libs/wagmi/connectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import carbonLogo from 'assets/logos/carbon.svg';
import tailwindWalletLogo from 'assets/logos/tailwindWallet.svg';
import compassWalletLogo from 'assets/logos/compassWallet.svg';
import seifWalletLogo from 'assets/logos/seifWallet.svg';
Expand Down Expand Up @@ -88,13 +87,11 @@ const getDefaultConnector = (connectorType: SelectableConnectionName) => {
dappMetadata: {
name: config.appName,
url: config.appUrl,
iconUrl: carbonLogo,
},
});
case 'Coinbase Wallet':
return coinbaseWallet({
appName: config.appName,
appLogoUrl: carbonLogo,
});
case 'WalletConnect':
return walletConnect({
Expand Down
454 changes: 312 additions & 142 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit d28e5d0

Please sign in to comment.