Skip to content

Commit

Permalink
Merge pull request #151 from SecureSECODAO/dev
Browse files Browse the repository at this point in the history
v0.6.0 merge dev to main
  • Loading branch information
Hidde-Heijnen authored Jun 26, 2023
2 parents fe9a820 + 4e38654 commit a54ed42
Show file tree
Hide file tree
Showing 65 changed files with 1,888 additions and 991 deletions.
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
VITE_APP_PROJECT_ID="your-project-id"
VITE_IPFS_KEY="your-ipfs-key"
VITE_IPFS_KEY="your-ipfs-key"
VITE_ALCHEMY_KEY="your-alchemy-key"
VITE_DEV_ALCHEMY_KEY="your-dev-alchemy-key"
27 changes: 13 additions & 14 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@
* LICENSE file in the root directory of this source tree.
*/

import type { Preview } from '@storybook/react';
import { withThemeByClassName } from '@storybook/addon-styling';
import type { Preview } from '@storybook/react';

import '../src/index.css';
import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import { wagmiClientDecorator } from '../src/lib/decorators/wagmiClientDecorator';
import { AragonSDKWrapper } from '../src/context/AragonSDK';
import { DiamondSDKWrapper } from '../src/context/DiamondGovernanceSDK';

import { TooltipProvider } from '../src/components/ui/Tooltip';
import { DiamondSDKWrapper } from '../src/context/DiamondGovernanceSDK';
import { wagmiClientDecorator } from '../src/lib/decorators/wagmiClientDecorator';

const preview: Preview = {
parameters: {
Expand Down Expand Up @@ -48,16 +49,14 @@ const globalDecorator = (Story, context) => {
document.documentElement.style.background = color;

return (
<AragonSDKWrapper>
<DiamondSDKWrapper>
{/* MemoryRouter mimics a BrowserRouter, but without actually changing the URL in the browser, for testing */}
<MemoryRouter>
<TooltipProvider>
<Story />
</TooltipProvider>
</MemoryRouter>
</DiamondSDKWrapper>
</AragonSDKWrapper>
<DiamondSDKWrapper>
{/* MemoryRouter mimics a BrowserRouter, but without actually changing the URL in the browser, for testing */}
<MemoryRouter>
<TooltipProvider>
<Story />
</TooltipProvider>
</MemoryRouter>
</DiamondSDKWrapper>
);
};

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,12 @@ It is also worth mentioning that it is highly encouraged to write stories for th

### Web3 packages

#### Aragon SDK
#### Alchemy SDK

[Documentation](https://devs.aragon.org/docs/sdk/)
[Documentation](https://docs.alchemy.com/reference/alchemy-sdk-quickstart)

Primarily used for: interacting with default Aragon smart contracts
Aragon SDK is used for interacting with the smart contracts from Aragon. We've been extending the base smart contracts with our own plugins, so for those, we use the custom Plopmens SDK to interact with our custom plugins. Because of our own SDK implementation that supports our plugin, the aragon sdk might become unused.
Used for: fetching DAO transfers and token balances.
An Alchemy key is expected in the [`.env.`](./.env) file.

#### Ethers

Expand Down
Loading

1 comment on commit a54ed42

@vercel
Copy link

@vercel vercel bot commented on a54ed42 Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.