Skip to content

Commit

Permalink
Merge pull request #414 from ergolabs/dev
Browse files Browse the repository at this point in the history 
Release v1.2.9
  • Loading branch information
@yasha-black
yasha-black authored Mar 14, 2022
2 parents 5bdd00c + 70bc774 commit 3058d04
Show file tree
Hide file tree
Showing 147 changed files with 3,132 additions and 1,943 deletions.
4 changes: 3 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@babel/core": "^7.15.5",
"@babel/preset-env": "^7.15.6",
"@craco/craco": "^6.3.0",
"@ergolabs/ergo-dex-sdk": "^1.3.12",
"@ergolabs/ergo-dex-sdk": "^1.4.0",
"@ergolabs/ergo-sdk": "^0.1.28",
"@rehooks/local-storage": "2.4.0",
"@sentry/react": "^6.16.1",
Expand All @@ -39,6 +39,7 @@
"@types/react-dom": "^17.0.9",
"@types/react-router-dom": "^5.1.8",
"@types/recharts": "^1.8.23",
"@types/styled-components": "^5.1.23",
"antd": "^4.17.0-alpha.5",
"axios": "^0.24.0",
"bignumber.js": "^9.0.1",
Expand Down Expand Up @@ -66,6 +67,7 @@
"recharts": "^2.1.8",
"rxjs": "^7.4.0",
"storybook-preset-craco": "^0.0.6",
"styled-components": "^5.3.3",
"typescript": "^4.3.5",
"web-vitals": "^1.0.1",
"yup": "^0.32.9"
Expand Down
15 changes: 5 additions & 10 deletions src/@types/dapp-wallet-web-bridge.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,10 @@ namespace ErgoBridge {
}

declare let ergoConnector: {
nautilus: any;
nautilus: {
connect: (params: { createErgoObject: boolean }) => Promise<boolean>;
getContext: () => Promise<ErgoBridge.ErgoAPI>;
};
};
declare let NautilusErgoApi: any;

declare let cardano: Record<string, any>;

declare let ergo: ErgoBridge.ErgoAPI;

interface Window {
yoroi: ErgoBridge.ErgoAPI;
nautilus: ErgoBridge.ErgoAPI;
}
declare let cardano: any;
104 changes: 47 additions & 57 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ import { Redirect, Route, Router, Switch } from 'react-router-dom';
import { initializeApp } from './common/streams/appTick';
import Layout from './components/common/Layout/Layout';
import { MobilePlug } from './components/MobilePlug/MobilePlug';
import {
AppLoadingProvider,
SettingsProvider,
WalletAddressesProvider,
} from './context';
import { AppLoadingProvider, SettingsProvider } from './context';
import { globalHistory } from './createBrowserHistory';
import { ContextModalProvider } from './ergodex-cdk';
import { AddLiquidity } from './pages/Pool/AddLiquidity/AddLiquidity';
import { AddLiquidity } from './pages/AddLiquidity/AddLiquidity';
import { Liquidity } from './pages/Pool/Liquidity';
import { LockLiquidity } from './pages/Pool/LockLiquidity/LockLiquidity';
import { Pool } from './pages/Pool/Pool';
import { RelockLiquidity } from './pages/Pool/RelockLiquidity/RelockLiquidity';
import { RemoveLiquidity } from './pages/Pool/RemoveLiquidity/RemoveLiquidity';
import { WithdrawalLiquidity } from './pages/Pool/WithdrawalLiquidity/WithdrawalLiquidity';
Expand All @@ -32,56 +28,50 @@ const Application = withTranslation()(() => {
<Router history={globalHistory}>
<AppLoadingProvider>
<SettingsProvider>
<WalletAddressesProvider>
<ContextModalProvider>
<Layout>
<BrowserView>
<Switch>
<Route path="/" exact>
<Redirect to="/swap" />
</Route>
<Route path="/swap" exact component={Swap} />
<Route path="/pool" exact component={Pool} />
<Route path="/pool/add" exact component={AddLiquidity} />
<Route
path="/pool/:poolId/remove"
exact
component={RemoveLiquidity}
/>
<Route
path="/pool/:poolId/lock"
exact
component={LockLiquidity}
/>
<Route
path="/pool/:poolId/relock"
exact
component={RelockLiquidity}
/>
<Route
path="/pool/:poolId/withdrawal"
exact
component={WithdrawalLiquidity}
/>
<Route
path="/pool/:poolId/add"
exact
component={AddLiquidity}
/>
<Route
path="/pool/:poolId"
exact
component={PoolOverview}
/>
<Route component={NotFound} />
</Switch>
</BrowserView>
<MobileView>
<MobilePlug />
</MobileView>
</Layout>
</ContextModalProvider>
</WalletAddressesProvider>
<ContextModalProvider>
<Layout>
<BrowserView>
<Switch>
<Route path="/" exact>
<Redirect to="/swap" />
</Route>
<Route path="/swap" exact component={Swap} />
<Route path="/pool" exact component={Liquidity} />
<Route path="/pool/add" exact component={AddLiquidity} />
<Route
path="/pool/:poolId/remove"
exact
component={RemoveLiquidity}
/>
<Route
path="/pool/:poolId/lock"
exact
component={LockLiquidity}
/>
<Route
path="/pool/:poolId/relock"
exact
component={RelockLiquidity}
/>
<Route
path="/pool/:poolId/withdrawal"
exact
component={WithdrawalLiquidity}
/>
<Route
path="/pool/:poolId/add"
exact
component={AddLiquidity}
/>
<Route path="/pool/:poolId" exact component={PoolOverview} />
<Route component={NotFound} />
</Switch>
</BrowserView>
<MobileView>
<MobilePlug />
</MobileView>
</Layout>
</ContextModalProvider>
</SettingsProvider>
</AppLoadingProvider>
</Router>
Expand Down
3 changes: 3 additions & 0 deletions src/applicationConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ interface ApplicationConfig {
readonly blacklistedPools: string[];
readonly operationsRestrictions: OperationRestriction[];
readonly requestRetryCount: number;
readonly iconsRepository: string;
}

export const applicationConfig: ApplicationConfig = {
Expand Down Expand Up @@ -55,4 +56,6 @@ export const applicationConfig: ApplicationConfig = {
operation: 'swap',
},
],
iconsRepository:
'https://raw.githubusercontent.com/ergolabs/ergo-dex-asset-icons/master',
};
12 changes: 6 additions & 6 deletions src/assets/icons/empty.svg
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/styles/styles.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body {
}

*::-webkit-scrollbar {
width: 6px;
width: 6px;
height: 56px;
}

Expand Down
Loading

0 comments on commit 3058d04

Please sign in to comment.