Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f633b5d
txt change
Dec 19, 2021
be66562
fixed terms and conditions
Dec 27, 2021
5c43dbe
fixed calim u-BPRO BIP4
Dec 27, 2021
fd77122
vesta-sidebar
Jan 18, 2022
ab8833e
static file generation for build
Jan 18, 2022
de21d3d
1.0.26
Jan 18, 2022
3d5a048
1.0.27
Jan 18, 2022
68754b0
1.0.28
Jan 18, 2022
fec674b
1.0.29
Jan 18, 2022
dad0d3d
fix
Feb 3, 2022
c6f738f
Merge branch 'feature/vesta-sidebar' into feature/side_bar_vesta
shmuel-web Feb 6, 2022
d5776dd
Merge pull request #218 from backstop-protocol/feature/side_bar_vesta
shmuel-web Feb 6, 2022
db3e3ef
Merge pull request #216 from backstop-protocol/feature/vesta-sidebar
shmuel-web Feb 6, 2022
fc09639
Merge branch 'development' into feature/hundred-link
shmuel-web Feb 6, 2022
60f9bde
Merge branch 'feature/hundred-link' into BugFix/FarmInfoClaim
shmuel-web Feb 6, 2022
3296f11
Merge pull request #214 from backstop-protocol/BugFix/FarmInfoClaim
shmuel-web Feb 6, 2022
e112f57
Merge branch 'feature/hundred-link' into BugFix/date-change
shmuel-web Feb 6, 2022
e1d203f
Merge pull request #213 from backstop-protocol/BugFix/date-change
shmuel-web Feb 6, 2022
59df94d
bugFix: maker import layout
Feb 6, 2022
c3f6412
Merge pull request #219 from backstop-protocol/feature/hundred-link
yaronvel Feb 6, 2022
483d819
bugFix: network alert
Feb 6, 2022
c90d14a
network alert fix
Feb 6, 2022
7aea960
Merge pull request #220 from backstop-protocol/BugFix/network_alert
yaronvel Feb 6, 2022
5bac3fc
fix
Feb 6, 2022
b8563b3
Merge pull request #222 from backstop-protocol/BugFix/sidebar_text_fix
yaronvel Feb 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion generate-static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ mkdir liquity && cp index.html liquity
mkdir faq && cp index.html faq
mkdir risk && cp index.html risk
mkdir terms && cp index.html terms
mkdir farm-info && cp index.html farm-info
mkdir farm-info && cp index.html farm-info
mkdir vesta && cp index.html vesta
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bprotocol-react-client",
"version": "1.0.25",
"version": "1.0.29",
"private": true,
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.1.0",
Expand Down
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const Dashboard = React.lazy(() => import("./containers/Dashboard"));
const Compound = React.lazy(() => import("./containers/Compound"));
const Liquity = React.lazy(() => import("./containers/Liquity"));
const LiquityLegacy = React.lazy(() => import("./containers/LiquityLegacy"));
const Vesta = React.lazy(() => import("./containers/Vesta"));
const Risk = React.lazy(() => import("./containers/Risk"));
const TermsOfUse = React.lazy(() => import("./containers/Terms"));
const FAQ = React.lazy(() => import("./containers/FAQ"));
Expand Down Expand Up @@ -55,6 +56,7 @@ const App = observer(() => {
<Route exact path="/compound" render={props =>(renderPage(props, Compound))} />
<Route exact path="/liquity" render={props =>(renderPage(props, Liquity))} />
<Route exact path="/liquity-leagacy" render={props =>(renderPage(props, LiquityLegacy))} />
<Route exact path="/vesta" render={props =>(renderPage(props, Vesta))} />
<Route exact path="/faq" render={props =>(renderPage(props, FAQ))} />
<Route exact path="/terms" render={props =>(renderPage(props, TermsOfUse))} />
<Route exact path="/risk" render={props =>(renderPage(props, Risk))} />
Expand Down
72 changes: 72 additions & 0 deletions src/assets/vesta-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/components/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Discord from "../assets/discord.svg";
import AAVELogo from "../assets/aav-ewhite-logo.svg";
import CompoundLogo from "../assets/compound-logo.svg";
import LiquityLogo from "../assets/liquity-logo.svg";
import VestaLogo from "../assets/vesta-logo.svg";
import MakerLogo from "../assets/logo-maker-white.svg";
import HundredLogo from "../assets/hundred-logo.svg";
import MigrationModal from "./modals/MigrationModal";
Expand Down Expand Up @@ -134,6 +135,15 @@ class Sidebar extends Component {
<img src={LiquityLogo} />
{false && <small>(Testnet)</small>}
</div>
<div
className={`product link-accesible ${
pathname === "/vesta" &&
"selected"
}`}
onClick={() => this.handleItemSelect("vesta")}>
<img src={VestaLogo} />
<small>Testnet</small>
</div>
<div className="product">
<a href="https://hundred.finance" target="_blank">
<img src={HundredLogo} />
Expand Down
27 changes: 27 additions & 0 deletions src/containers/Vesta.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React, { Component } from "react";
import {observer} from "mobx-react"
import routerStore from "../stores/router.store"

class Vesta extends Component {

constructor(props) {
super(props);
}

componentDidMount() {
routerStore.setRouteProps(this.props.history)
}

render() {
return (
<iframe
src="/vesta-app/"
width="100%"
height="100%"
frameBorder="0"
/>
);
}
}

export default observer(Vesta)
14 changes: 13 additions & 1 deletion src/stores/user.store.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ import WalletConnectProvider from "@walletconnect/web3-provider";
import {walletTypes, getMetaMask, getWalletConnect} from "../wallets/Wallets"
import WalletSelectionModal from "../components/modals/WalletSelectionModal"

const supportedNetworks = {
"1": "Mainnet",
"42": "Kovan",
"421611": "Arbitrum Testnet",
"1137": "Hardhat"
}

class UserStore {

loggedIn = false
Expand Down Expand Up @@ -100,7 +107,8 @@ class UserStore {
// save connection data to local storage
window.localStorage.setItem("walletType", this.walletType)
const networkType = await this.web3.eth.net.getId()
if (parseInt(networkType) !== parseInt(0x2a) && parseInt(networkType) !== parseInt(0x1) && parseInt(networkType) !== 1337) {
debugger
if (!supportedNetworks[networkType.toString()]) {
EventBus.$emit("app-error", "Only Mainnet and Kovan testnet are supported");
return false;
}
Expand Down Expand Up @@ -134,6 +142,10 @@ class UserStore {

connectionWarning = () => {
this.loggedIn = false
if(window.location.pathname != "/compound"){
this.removeConnectionWarning()
return
}
EventBus.$emit('app-alert', "something went wrong please try to reconnect", "reconnect", this.connect)
}

Expand Down