Skip to content

Commit

Permalink
Updating release (#517)
Browse files Browse the repository at this point in the history
* Only fetch price relay data when tokens are for correct chain (#505)

* Moving scroll to top to shared (#506)

* Remove link to Prime from header (#514)

* Adding sentry webpack plugin to prime (#515)

* Update README.md (#516)

---------

Co-authored-by: Hayden Shively <17186559+haydenshively@users.noreply.github.com>
  • Loading branch information
IanWoodard and haydenshively authored Jul 15, 2023
1 parent 4bd4b4d commit 81aedfa
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 22 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ To run the Earn app, run the following command from the root directory:
cd earn
yarn start
```
> Note that the `yarn start` command will also build the `shared` directory. If you are making changes to the `shared` directory, you will need to stop the app and run `yarn start` again to see the changes. Changes made to the `earn` directory will be reflected immediately however.
> Note that the `yarn start` command will also build the `shared` directory. If you are making changes to the `shared` directory, you will need to stop the app and run `yarn start` again to see the changes. Changes made to the `earn` directory will be reflected immediately, however. If you want to see changes made in shared immediately, run `yarn start` in the `shared` directory while `earn` is also running.
To build the Earn app for production, run the following command from the root directory:
```
Expand All @@ -66,7 +66,7 @@ To run the Prime app, run the following command from the root directory:
cd prime
yarn start
```
> Note that the `yarn start` command will also build the `shared` directory. If you are making changes to the `shared` directory, you will need to stop the app and run `yarn start` again to see the changes. Changes made to the `prime` directory will be reflected immediately however.
> Note that the `yarn start` command will also build the `shared` directory. If you are making changes to the `shared` directory, you will need to stop the app and run `yarn start` again to see the changes. Changes made to the `prime` directory will be reflected immediately, however. If you want to see changes made in shared immediately, run `yarn start` in the `shared` directory while `prime` is also running.
To build the Prime app for production, run the following command from the root directory:
```
Expand Down
2 changes: 1 addition & 1 deletion earn/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import WelcomeModal from 'shared/lib/components/common/WelcomeModal';
import WagmiProvider from 'shared/lib/components/WagmiProvider';
import { DEFAULT_CHAIN } from 'shared/lib/data/constants/Values';
import { getLocalStorageBoolean, setLocalStorageBoolean } from 'shared/lib/util/LocalStorage';
import ScrollToTop from 'shared/lib/util/ScrollToTop';
import { useAccount, useNetwork } from 'wagmi';
import { Chain } from 'wagmi/chains';

Expand All @@ -18,7 +19,6 @@ import BorrowPage from './pages/BorrowPage';
import ClaimPage from './pages/ClaimPage';
import LendPage from './pages/LendPage';
import PortfolioPage from './pages/PortfolioPage';
import ScrollToTop from './util/ScrollToTop';

const CONNECT_WALLET_CHECKBOXES = [
<Text size='M' weight='regular'>
Expand Down
8 changes: 1 addition & 7 deletions earn/src/components/header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import styled from 'styled-components';
import tw from 'twin.macro';

import { ChainContext } from '../../App';
import { primeUrl } from '../../data/constants/Values';

const NAV_LINKS: NavBarLink[] = [
{
Expand All @@ -17,14 +16,9 @@ const NAV_LINKS: NavBarLink[] = [
label: 'Markets',
to: '/markets',
},
{
label: 'Borrow',
to: '/borrow',
},
{
label: 'Advanced',
to: primeUrl(),
isExternal: true,
to: '/borrow',
},
];

Expand Down
4 changes: 4 additions & 0 deletions earn/src/pages/PortfolioPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ export default function PortfolioPage() {
useEffect(() => {
let mounted = true;
async function fetch() {
// Only fetch prices for tokens if they are all on the same (active) chain
if (uniqueTokens.length > 0 && uniqueTokens.some((token) => token.chainId !== activeChain.id)) {
return;
}
const symbols = uniqueTokens
.map((token) => token?.symbol)
.filter((symbol) => symbol !== undefined)
Expand Down
7 changes: 7 additions & 0 deletions prime/craco.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const webpack = require('webpack');
const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");

module.exports = {
webpack: {
configure: {
Expand All @@ -19,6 +21,11 @@ module.exports = {
Buffer: ['buffer', 'Buffer'],
process: 'process/browser',
}),
sentryWebpackPlugin({
authToken: process.env.SENTRY_AUTH_TOKEN,
org: "aloe-labs-inc",
project: "aloe-prime",
}),
],
module: {
rules: [
Expand Down
1 change: 1 addition & 0 deletions prime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@heroicons/react": "^1.0.5",
"@metamask/jazzicon": "^2.0.0",
"@sentry/react": "^7.57.0",
"@sentry/webpack-plugin": "^2.4.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
Expand Down
2 changes: 1 addition & 1 deletion prime/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import WagmiProvider from 'shared/lib/components/WagmiProvider';
import { DEFAULT_CHAIN } from 'shared/lib/data/constants/Values';
import useEffectOnce from 'shared/lib/data/hooks/UseEffectOnce';
import { getLocalStorageBoolean, setLocalStorageBoolean } from 'shared/lib/util/LocalStorage';
import ScrollToTop from 'shared/lib/util/ScrollToTop';
import { isDappnet, isDevelopment } from 'shared/lib/util/Utils';
import { useAccount, useNetwork } from 'wagmi';
import { Chain } from 'wagmi/chains';
Expand All @@ -21,7 +22,6 @@ import { API_GEO_FENCING_URL } from './data/constants/Values';
import { GeoFencingResponse } from './data/GeoFencingResponse';
import BorrowAccountsPage from './pages/BorrowAccountsPage';
import BorrowActionsPage from './pages/BorrowActionsPage';
import ScrollToTop from './util/ScrollToTop';

const CONNECT_WALLET_CHECKBOXES = [
<Text size='M' weight='regular'>
Expand Down
11 changes: 0 additions & 11 deletions prime/src/util/ScrollToTop.tsx

This file was deleted.

File renamed without changes.

0 comments on commit 81aedfa

Please sign in to comment.