Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Token Trade Implementation #2055

Merged
merged 34 commits into from
Sep 13, 2020
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
db82d0e
[WIP] Token Trade Plugin
namesty Jul 28, 2020
46dfc7f
CreateProposal and ProposalSummary created for TokenTrade (untested)
namesty Jul 31, 2020
0eff4b2
Token trade fixes for BN.js amoun types
namesty Aug 6, 2020
ca106be
[WIP] Create token trade proposal
namesty Aug 10, 2020
55bdf54
updating images
cbrzn Aug 10, 2020
b2ec716
TokenTrade proposal summary fixed
namesty Aug 11, 2020
702b49f
Eliminated console.logs
namesty Aug 11, 2020
615eea0
Merge branch 'dev-2' into token-trade
namesty Aug 12, 2020
0aea5b9
Updated arc.js, test env and subgraph (#2072)
roienatan Aug 16, 2020
2ea45ff
Form service - i18next
namesty Aug 16, 2020
9057ad9
[WIP] styling details
namesty Aug 16, 2020
c81df3c
Plugin manager create proposal modal has a left border and padding li…
roienatan Aug 17, 2020
0110ed3
fix UI where votes screwed up (#2070)
roienatan Aug 17, 2020
1ccb143
Better UI for DAO history page (#2069)
roienatan Aug 17, 2020
fa0f07d
Update documentation (#2062)
roienatan Aug 17, 2020
da3b547
refactor and fix issues relating 3box operations (#2018)
dkent600 Aug 17, 2020
4bbd8fe
fix issue when a proposal card is not always clickable (#2077)
roienatan Aug 17, 2020
adf2aae
revert subgraph endpoint domain (#2078)
dkent600 Aug 17, 2020
875ef5a
Support DAOs sort by total holdings (#2085)
roienatan Aug 18, 2020
268434b
Styling for Token Trade Proposal Summary and Changed JoinAndQuit naming
namesty Aug 19, 2020
3e768e6
Merge branch 'dev-2' into token-trade
namesty Aug 19, 2020
713aea8
Merge fixes
namesty Aug 19, 2020
f807f0f
Added package.lock
namesty Aug 19, 2020
e28be5b
Minor adjustments due to changes in DAOs balances serivce that now re…
roienatan Aug 30, 2020
b635fa6
bumping arc.js version
cbrzn Sep 1, 2020
61ca1b4
Updated chrome driver for tests (#2093)
roienatan Sep 1, 2020
060cbe2
dev-2 merged
cbrzn Sep 1, 2020
64ebe1f
lint error fix
cbrzn Sep 1, 2020
2d8fce9
dev2 updated
cbrzn Sep 8, 2020
1d91489
tests for token trade proposal implemented
cbrzn Sep 8, 2020
e5e50df
fix lint
cbrzn Sep 8, 2020
1413377
removed unused import
cbrzn Sep 9, 2020
ebfc5f3
conflict fixed
cbrzn Sep 10, 2020
cad610d
added token trade to required plugin permissions object
cbrzn Sep 10, 2020
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
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ services:
GRAPH_GRAPHQL_MAX_FIRST: 1000

ipfs:
image: daostack/test-env-experimental-ipfs:4.0.17
image: daostack/test-env-experimental-ipfs:4.0.18
ports:
- 5001:5001

postgres:
image: daostack/test-env-experimental-postgres:4.0.17
image: daostack/test-env-experimental-postgres:4.0.18
ports:
- 9432:5432
environment:
POSTGRES_PASSWORD: 'letmein'

ganache:
image: daostack/test-env-experimental-ganache:4.0.17
image: daostack/test-env-experimental-ganache:4.0.18
ports:
- 8545:8545
23 changes: 23 additions & 0 deletions docs/4devs.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,26 @@ For _very_ rough statistics, open devTools -> Network and look at the line that
## Subscriptions and queries

For the performance of the app, it is important that we limit the amount of queries and subscriptions that alchemy creates when loading a page.

## Coding conventions

- As an ongoing process of adopting language localization, any new static text should be added to a translation file and used via `i18next` internationalization-framework.
Translation files location is under `src/assets/locales/`. After adding your text just import `i18next` and use the translation function:

`src/assets/locales/en/translation.json`

```
{
"My text key" : "Lorem ipsum dolor sit amet"
}
```

Your code:

```
import i18next from "i18next";

i18next.t("My text key"")}
```
- Use global variables for styling. See `src/assets/styles/global-variables.scss`.
We aim to stick to a uniform variables palette so add a new one only if it's necessary.
2 changes: 1 addition & 1 deletion docs/Alchemy_2_0_Benefits.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
## Misc
- NFT management plugin - send/mint/list
- Arc.react - enable easy custom React UI components on top of subgraph and arc.js
- 2 new Common plugins - JoinAndQuit and Funding Request.
- 2 new Common plugins - Join and Funding Request.
- Key value on chain DAO DB (implemented for Common) though can be used by other DAOs.
- Automatic etherscan/blockscout contract verification upon each DAO deployment.
Loading