From eaa71c01fa7e0ee51428f937ea0ec82b78305b6f Mon Sep 17 00:00:00 2001 From: Franck Date: Thu, 23 Dec 2021 16:03:01 +1100 Subject: [PATCH 1/5] s/DappConnect/WakuConnect/ --- README.md | 12 ++++++------ packages/example/README.md | 2 +- packages/mainnet-poll-example/README.md | 2 +- packages/poll-example/README.md | 2 +- packages/vote-example/README.md | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 88af4ba..0be1cfb 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# DappConnect Vote & Poll SDKs +# WakuConnect Vote & Poll SDKs -A set of DappConnect SDKs to enable gas efficient voting and gasless polling over Waku +A set of WakuConnect SDKs to enable gas efficient voting and gasless polling over Waku -## DappConnect Vote SDK +## WakuConnect Vote SDK -The DappConnect Vote SDK allows you to leverage Waku to save gas fees for most voters. +The WakuConnect Vote SDK allows you to leverage Waku to save gas fees for most voters. It leverages Waku, a decentralized communication network, to broadcast and aggregates votes. Most token holders will not need to spend gas to vote. @@ -151,8 +151,8 @@ A vote may become invalid between reception over Waku and submission to the smar - The voter has transferred a number of token out of their account, making the account balance lesser than the vote weight, - A vote for this voter has already been submitted to the smart contract (whether or not it has the same value). -## DappConnect Poll SDK +## WakuConnect Poll SDK -The DappConnect Poll SDK allows users to create, answer and view polls in a decentralized, censorship-resistant manner. +The WakuConnect Poll SDK allows users to create, answer and view polls in a decentralized, censorship-resistant manner. The polls are published over Waku, there is no interaction with any blockchain, removing gas costs. diff --git a/packages/example/README.md b/packages/example/README.md index c40a246..c910066 100644 --- a/packages/example/README.md +++ b/packages/example/README.md @@ -1 +1 @@ -# DappConnect Vote & Poll SDK Example +# WakuConnect Vote & Poll SDK Example diff --git a/packages/mainnet-poll-example/README.md b/packages/mainnet-poll-example/README.md index 58e5604..1d2a1df 100644 --- a/packages/mainnet-poll-example/README.md +++ b/packages/mainnet-poll-example/README.md @@ -1 +1 @@ -# Mainnet DappConnect Poll SDK Example +# Mainnet WakuConnect Poll SDK Example diff --git a/packages/poll-example/README.md b/packages/poll-example/README.md index c5b4ee9..1c73b1b 100644 --- a/packages/poll-example/README.md +++ b/packages/poll-example/README.md @@ -1,4 +1,4 @@ -# DappConnect Poll SDK Example +# WakuConnect Poll SDK Example This package is example usage of WakuPolling diff --git a/packages/vote-example/README.md b/packages/vote-example/README.md index 218ed06..3994e22 100644 --- a/packages/vote-example/README.md +++ b/packages/vote-example/README.md @@ -1,6 +1,6 @@ -# DappConnect Vote SDK Example +# WakuConnect Vote SDK Example -Package contains example usage of DappConnect Vote SDK +Package contains example usage of WakuConnect Vote SDK For more detailed api please see README in voting-hooks and voting-components From 293d43e9398d645da18aa493d113f5eceef9ca64 Mon Sep 17 00:00:00 2001 From: Franck Date: Thu, 23 Dec 2021 16:04:36 +1100 Subject: [PATCH 2/5] s/@dappconnect/@waku/ --- package.json | 2 +- packages/contracts/package.json | 2 +- packages/core/README.md | 4 ++-- packages/core/package.json | 4 ++-- packages/core/src/classes/WakuVoting.ts | 2 +- packages/example/package.json | 6 +++--- packages/example/src/index.tsx | 4 ++-- packages/mainnet-poll-example/package.json | 10 +++++----- .../src/components/WakuPolling.tsx | 8 ++++---- packages/mainnet-poll-example/src/index.tsx | 4 ++-- packages/poll-example/package.json | 10 +++++----- .../poll-example/src/components/WakuPolling.tsx | 8 ++++---- packages/poll-example/src/index.tsx | 4 ++-- packages/poll-react-components/package.json | 8 ++++---- .../poll-react-components/src/components/Poll.tsx | 10 +++++----- .../src/components/PollCreation.tsx | 8 ++++---- .../src/components/PollList.tsx | 8 ++++---- .../src/components/PollResults.tsx | 4 ++-- packages/poll-react-hooks/package.json | 4 ++-- packages/poll-react-hooks/src/hooks/usePollList.ts | 4 ++-- .../poll-react-hooks/src/hooks/useWakuPolling.ts | 2 +- packages/react-components/package.json | 4 ++-- .../react-components/src/hooks/useTokenBalance.ts | 2 +- packages/vote-example/package.json | 10 +++++----- packages/vote-example/src/components/Voting.tsx | 14 +++++++------- .../vote-example/src/components/VotingMobile.tsx | 6 +++--- packages/vote-example/src/index.tsx | 6 +++--- packages/vote-react-components/package.json | 8 ++++---- .../src/components/Buttons.tsx | 2 +- .../src/components/NotificationItem.tsx | 4 ++-- .../src/components/ProposalInfo.tsx | 2 +- .../components/ProposalVoteCard/ProposalVote.tsx | 4 ++-- .../src/components/ProposalVoteCard/VoteChart.tsx | 6 +++--- .../src/components/VoteModal/AmountModal.tsx | 4 ++-- .../src/components/VoteModal/ConfirmModal.tsx | 4 ++-- .../src/components/VoteModal/VoteModal.tsx | 6 +++--- .../src/components/VotePropose.tsx | 2 +- .../src/components/VotingRoomCard.tsx | 10 +++++----- .../src/components/VotingRoomList.tsx | 6 +++--- .../src/components/VotingRoomListEmpty.tsx | 2 +- .../src/components/VotingRoomListHeader.tsx | 4 ++-- .../src/components/mobile/NewVotingRoomMobile.tsx | 2 +- .../src/components/mobile/VotingRoomMobile.tsx | 4 ++-- .../components/newVoteModal/NewVotingRoomModal.tsx | 4 ++-- .../components/newVoteModal/TokenAmountScreen.tsx | 2 +- .../newVoteModal/VotingRoomDetailInput.tsx | 4 ++-- packages/vote-react-hooks/package.json | 4 ++-- .../vote-react-hooks/src/hooks/useVotingRoom.ts | 4 ++-- .../vote-react-hooks/src/hooks/useVotingRoomsId.ts | 4 ++-- .../vote-react-hooks/src/hooks/useWakuVoting.ts | 2 +- 50 files changed, 126 insertions(+), 126 deletions(-) diff --git a/package.json b/package.json index 21b0211..aea1cba 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-poll-sdk", + "name": "@waku/vote-poll-sdk", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "private": true, "license": "MIT OR Apache-2.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 7574ae9..40e476d 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-sdk-contracts", + "name": "@waku/vote-sdk-contracts", "version": "0.0.1", "main": "index.js", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", diff --git a/packages/core/README.md b/packages/core/README.md index db7262c..ecd1f50 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -56,7 +56,7 @@ WakuVoting create function expects name of DApp and address of a voting contract Address of token is derived from votingContract ```ts - import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' + import { WakuVoting } from '@waku/vote-poll-sdk-core' await WakuVoting.create(appName, contractAddress, provider, multicallAddress, waku) ``` @@ -148,7 +148,7 @@ To make it easier to use WakuPolling class was created WakuPolling create expects name of DApp and address of a token contract, web3provider, also as optional parameter can take custom Waku object. ```ts - import { WakuPolling } from '@dappconnect/vote-poll-sdk-core' + import { WakuPolling } from '@waku/vote-poll-sdk-core' await WakuPolling.create(appName, tokenAddress, provider, multicallAddress, waku) ``` diff --git a/packages/core/package.json b/packages/core/package.json index 7b095fa..0f622c6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-poll-sdk-core", + "name": "@waku/vote-poll-sdk-core", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", @@ -42,7 +42,7 @@ "typescript": "^4.3.5" }, "dependencies": { - "@dappconnect/vote-sdk-contracts": "^0.0.1", + "@waku/vote-sdk-contracts": "^0.0.1", "eth-sig-util": "^3.0.1", "ethers": "^5.4.4", "js-waku": "^0.11.0", diff --git a/packages/core/src/classes/WakuVoting.ts b/packages/core/src/classes/WakuVoting.ts index 87d156d..8613121 100644 --- a/packages/core/src/classes/WakuVoting.ts +++ b/packages/core/src/classes/WakuVoting.ts @@ -1,4 +1,4 @@ -import { VotingContract } from '@dappconnect/vote-sdk-contracts/abi' +import { VotingContract } from '@waku/vote-sdk-contracts/abi' import { WakuMessaging } from './WakuMessaging' import { Contract, Wallet, BigNumber, ethers, utils } from 'ethers' import { Waku, WakuMessage } from 'js-waku' diff --git a/packages/example/package.json b/packages/example/package.json index c6c04d0..38ec74f 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-poll-sdk-example", + "name": "@waku/vote-poll-sdk-example", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "index.js", @@ -16,8 +16,8 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/poll-sdk-example": "^0.1.0", - "@dappconnect/vote-sdk-example": "^0.1.0", + "@waku/poll-sdk-example": "^0.1.0", + "@waku/vote-sdk-example": "^0.1.0", "assert": "^2.0.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", diff --git a/packages/example/src/index.tsx b/packages/example/src/index.tsx index 6dc8424..0726e0a 100644 --- a/packages/example/src/index.tsx +++ b/packages/example/src/index.tsx @@ -1,7 +1,7 @@ import React from 'react' import ReactDOM from 'react-dom' -import { PollingPage } from '@dappconnect/poll-sdk-example' -import { VotingPage } from '@dappconnect/vote-sdk-example' +import { PollingPage } from '@waku/poll-sdk-example' +import { VotingPage } from '@waku/vote-sdk-example' import { BrowserRouter } from 'react-router-dom' import { Route, Switch } from 'react-router' diff --git a/packages/mainnet-poll-example/package.json b/packages/mainnet-poll-example/package.json index 080f09e..0b9677a 100644 --- a/packages/mainnet-poll-example/package.json +++ b/packages/mainnet-poll-example/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/mainnet-poll-sdk-example", + "name": "@waku/mainnet-poll-sdk-example", "version": "0.1.0", "main": "index.js", "license": "MIT", @@ -15,10 +15,10 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", - "@dappconnect/poll-sdk-react-components": "^0.1.0", - "@dappconnect/poll-sdk-react-hooks": "^0.1.0", - "@dappconnect/vote-poll-sdk-react-components": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", + "@waku/poll-sdk-react-components": "^0.1.0", + "@waku/poll-sdk-react-hooks": "^0.1.0", + "@waku/vote-poll-sdk-react-components": "^0.1.0", "@usedapp/core": "^0.4.7", "ethers": "^5.4.4", "react": "^17.0.2", diff --git a/packages/mainnet-poll-example/src/components/WakuPolling.tsx b/packages/mainnet-poll-example/src/components/WakuPolling.tsx index dcf8e8a..299af1f 100644 --- a/packages/mainnet-poll-example/src/components/WakuPolling.tsx +++ b/packages/mainnet-poll-example/src/components/WakuPolling.tsx @@ -2,11 +2,11 @@ import React, { useState, useEffect } from 'react' import { useConfig, useEthers } from '@usedapp/core' import styled from 'styled-components' -import { PollList, PollCreation } from '@dappconnect/poll-sdk-react-components' +import { PollList, PollCreation } from '@waku/poll-sdk-react-components' import { JsonRpcSigner } from '@ethersproject/providers' -import { useWakuPolling } from '@dappconnect/poll-sdk-react-hooks' -import { Modal, Networks, CreateButton } from '@dappconnect/vote-poll-sdk-react-components' -import { Theme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { useWakuPolling } from '@waku/poll-sdk-react-hooks' +import { Modal, Networks, CreateButton } from '@waku/vote-poll-sdk-react-components' +import { Theme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' type WakuPollingProps = { appName: string diff --git a/packages/mainnet-poll-example/src/index.tsx b/packages/mainnet-poll-example/src/index.tsx index 05a5004..354e53b 100644 --- a/packages/mainnet-poll-example/src/index.tsx +++ b/packages/mainnet-poll-example/src/index.tsx @@ -3,10 +3,10 @@ import styled from 'styled-components' import { DAppProvider, ChainId, useEthers } from '@usedapp/core' import { DEFAULT_CONFIG } from '@usedapp/core/dist/cjs/src/model/config/default' import { WakuPolling } from './components/WakuPolling' -import { TopBar, GlobalStyle } from '@dappconnect/vote-poll-sdk-react-components' +import { TopBar, GlobalStyle } from '@waku/vote-poll-sdk-react-components' import pollingIcon from './assets/images/pollingIcon.png' import { JsonRpcSigner } from '@ethersproject/providers' -import { orangeTheme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { orangeTheme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' import ReactDOM from 'react-dom' import { BrowserRouter } from 'react-router-dom' import { Route, Switch } from 'react-router' diff --git a/packages/poll-example/package.json b/packages/poll-example/package.json index e94a390..1f649e1 100644 --- a/packages/poll-example/package.json +++ b/packages/poll-example/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/poll-sdk-example", + "name": "@waku/poll-sdk-example", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", @@ -31,10 +31,10 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", - "@dappconnect/poll-sdk-react-components": "^0.1.0", - "@dappconnect/poll-sdk-react-hooks": "^0.1.0", - "@dappconnect/vote-poll-sdk-react-components": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", + "@waku/poll-sdk-react-components": "^0.1.0", + "@waku/poll-sdk-react-hooks": "^0.1.0", + "@waku/vote-poll-sdk-react-components": "^0.1.0", "@usedapp/core": "^0.4.7", "ethers": "^5.4.4", "react": "^17.0.2", diff --git a/packages/poll-example/src/components/WakuPolling.tsx b/packages/poll-example/src/components/WakuPolling.tsx index 5e1907b..bbe2877 100644 --- a/packages/poll-example/src/components/WakuPolling.tsx +++ b/packages/poll-example/src/components/WakuPolling.tsx @@ -2,11 +2,11 @@ import React, { useState, useEffect } from 'react' import { useConfig, useEthers } from '@usedapp/core' import styled from 'styled-components' -import { PollList, PollCreation } from '@dappconnect/poll-sdk-react-components' +import { PollList, PollCreation } from '@waku/poll-sdk-react-components' import { JsonRpcSigner } from '@ethersproject/providers' -import { useWakuPolling } from '@dappconnect/poll-sdk-react-hooks' -import { Modal, Networks, CreateButton } from '@dappconnect/vote-poll-sdk-react-components' -import { Theme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { useWakuPolling } from '@waku/poll-sdk-react-hooks' +import { Modal, Networks, CreateButton } from '@waku/vote-poll-sdk-react-components' +import { Theme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' type WakuPollingProps = { appName: string diff --git a/packages/poll-example/src/index.tsx b/packages/poll-example/src/index.tsx index fd55ec7..c84d477 100644 --- a/packages/poll-example/src/index.tsx +++ b/packages/poll-example/src/index.tsx @@ -3,10 +3,10 @@ import styled from 'styled-components' import { DAppProvider, ChainId, useEthers } from '@usedapp/core' import { DEFAULT_CONFIG } from '@usedapp/core/dist/cjs/src/model/config/default' import { WakuPolling } from './components/WakuPolling' -import { TopBar, GlobalStyle } from '@dappconnect/vote-poll-sdk-react-components' +import { TopBar, GlobalStyle } from '@waku/vote-poll-sdk-react-components' import pollingIcon from './assets/images/pollingIcon.png' import { JsonRpcSigner } from '@ethersproject/providers' -import { orangeTheme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { orangeTheme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' const config = { readOnlyChainId: ChainId.Ropsten, diff --git a/packages/poll-react-components/package.json b/packages/poll-react-components/package.json index 7184074..f3a42bb 100644 --- a/packages/poll-react-components/package.json +++ b/packages/poll-react-components/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/poll-sdk-react-components", + "name": "@waku/poll-sdk-react-components", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", @@ -33,9 +33,9 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", - "@dappconnect/poll-sdk-react-hooks": "^0.1.0", - "@dappconnect/vote-poll-sdk-react-components": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", + "@waku/poll-sdk-react-hooks": "^0.1.0", + "@waku/vote-poll-sdk-react-components": "^0.1.0", "ethers": "^5.4.4", "react": "^17.0.2", "styled-components": "^5.3.0" diff --git a/packages/poll-react-components/src/components/Poll.tsx b/packages/poll-react-components/src/components/Poll.tsx index 272c7d0..3965847 100644 --- a/packages/poll-react-components/src/components/Poll.tsx +++ b/packages/poll-react-components/src/components/Poll.tsx @@ -1,12 +1,12 @@ -import { WakuPolling } from '@dappconnect/vote-poll-sdk-core' -import { DetailedTimedPoll } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' +import { WakuPolling } from '@waku/vote-poll-sdk-core' +import { DetailedTimedPoll } from '@waku/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' import { BigNumber } from 'ethers' import React, { useEffect, useState } from 'react' -import { PollType } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { PollType } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' import styled from 'styled-components' -import { RadioGroup, SmallButton, Theme } from '@dappconnect/vote-poll-sdk-react-components' +import { RadioGroup, SmallButton, Theme } from '@waku/vote-poll-sdk-react-components' import { PollResults } from './PollResults' -import { Modal } from '@dappconnect/vote-poll-sdk-react-components' +import { Modal } from '@waku/vote-poll-sdk-react-components' type PollProps = { theme: Theme diff --git a/packages/poll-react-components/src/components/PollCreation.tsx b/packages/poll-react-components/src/components/PollCreation.tsx index 35c7ce0..f2ab4ed 100644 --- a/packages/poll-react-components/src/components/PollCreation.tsx +++ b/packages/poll-react-components/src/components/PollCreation.tsx @@ -1,9 +1,9 @@ import React, { ReactNode, useState } from 'react' import styled from 'styled-components' -import { PollType } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' -import { WakuPolling } from '@dappconnect/vote-poll-sdk-core' -import { Input, addIcon, SmallButton, Modal, Theme } from '@dappconnect/vote-poll-sdk-react-components' -import { MESSAGE_SENDING_RESULT } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/classes/WakuPolling' +import { PollType } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuPolling } from '@waku/vote-poll-sdk-core' +import { Input, addIcon, SmallButton, Modal, Theme } from '@waku/vote-poll-sdk-react-components' +import { MESSAGE_SENDING_RESULT } from '@waku/vote-poll-sdk-core/dist/esm/src/classes/WakuPolling' const defaultPollDuration = 7 * 24 * 60 * 60 * 1000 // One week in ms. diff --git a/packages/poll-react-components/src/components/PollList.tsx b/packages/poll-react-components/src/components/PollList.tsx index b8f5337..a4eda2f 100644 --- a/packages/poll-react-components/src/components/PollList.tsx +++ b/packages/poll-react-components/src/components/PollList.tsx @@ -1,10 +1,10 @@ -import { WakuPolling } from '@dappconnect/vote-poll-sdk-core' -import { DetailedTimedPoll } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' +import { WakuPolling } from '@waku/vote-poll-sdk-core' +import { DetailedTimedPoll } from '@waku/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' import React, { useEffect, useState } from 'react' import { Poll } from './Poll' import styled from 'styled-components' -import { Theme } from '@dappconnect/vote-poll-sdk-react-components' -import { usePollList } from '@dappconnect/poll-sdk-react-hooks' +import { Theme } from '@waku/vote-poll-sdk-react-components' +import { usePollList } from '@waku/poll-sdk-react-hooks' type PollListProps = { theme: Theme wakuPolling: WakuPolling | undefined diff --git a/packages/poll-react-components/src/components/PollResults.tsx b/packages/poll-react-components/src/components/PollResults.tsx index 87849c8..2d3862f 100644 --- a/packages/poll-react-components/src/components/PollResults.tsx +++ b/packages/poll-react-components/src/components/PollResults.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { DetailedTimedPoll } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' +import { DetailedTimedPoll } from '@waku/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' import styled from 'styled-components' -import { colorRouletteGenerator, checkCircleIcon } from '@dappconnect/vote-poll-sdk-react-components' +import { colorRouletteGenerator, checkCircleIcon } from '@waku/vote-poll-sdk-react-components' type PollResultsProps = { poll: DetailedTimedPoll diff --git a/packages/poll-react-hooks/package.json b/packages/poll-react-hooks/package.json index 42ecfd8..3a03357 100644 --- a/packages/poll-react-hooks/package.json +++ b/packages/poll-react-hooks/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/poll-sdk-react-hooks", + "name": "@waku/poll-sdk-react-hooks", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", @@ -29,7 +29,7 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", "@usedapp/core": "^0.4.7", "ethers": "^5.4.4", "react": "^17.0.2", diff --git a/packages/poll-react-hooks/src/hooks/usePollList.ts b/packages/poll-react-hooks/src/hooks/usePollList.ts index f9fb113..a79a98c 100644 --- a/packages/poll-react-hooks/src/hooks/usePollList.ts +++ b/packages/poll-react-hooks/src/hooks/usePollList.ts @@ -1,5 +1,5 @@ -import { WakuPolling } from '@dappconnect/vote-poll-sdk-core' -import { DetailedTimedPoll } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' +import { WakuPolling } from '@waku/vote-poll-sdk-core' +import { DetailedTimedPoll } from '@waku/vote-poll-sdk-core/dist/esm/src/models/DetailedTimedPoll' import React, { useEffect, useState } from 'react' export function usePollList(wakuPolling: WakuPolling | undefined) { diff --git a/packages/poll-react-hooks/src/hooks/useWakuPolling.ts b/packages/poll-react-hooks/src/hooks/useWakuPolling.ts index 8ca1fa3..2f95ffb 100644 --- a/packages/poll-react-hooks/src/hooks/useWakuPolling.ts +++ b/packages/poll-react-hooks/src/hooks/useWakuPolling.ts @@ -1,5 +1,5 @@ import { useEffect, useState, useRef } from 'react' -import { WakuPolling } from '@dappconnect/vote-poll-sdk-core' +import { WakuPolling } from '@waku/vote-poll-sdk-core' import { Web3Provider } from '@ethersproject/providers' export function useWakuPolling( diff --git a/packages/react-components/package.json b/packages/react-components/package.json index f2e587b..a44d6b6 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-poll-sdk-react-components", + "name": "@waku/vote-poll-sdk-react-components", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", @@ -34,7 +34,7 @@ "ethers": "^5.4.4", "react": "^17.0.2", "styled-components": "^5.3.0", - "@dappconnect/vote-poll-sdk-core": "^0.1.0" + "@waku/vote-poll-sdk-core": "^0.1.0" }, "devDependencies": { "@types/chai": "^4.2.21", diff --git a/packages/react-components/src/hooks/useTokenBalance.ts b/packages/react-components/src/hooks/useTokenBalance.ts index 8a6f21d..496b683 100644 --- a/packages/react-components/src/hooks/useTokenBalance.ts +++ b/packages/react-components/src/hooks/useTokenBalance.ts @@ -1,4 +1,4 @@ -import { WakuMessaging } from '@dappconnect/vote-poll-sdk-core' +import { WakuMessaging } from '@waku/vote-poll-sdk-core' import { BigNumber } from 'ethers' import React, { useEffect, useState } from 'react' diff --git a/packages/vote-example/package.json b/packages/vote-example/package.json index 085165e..cb1fa39 100644 --- a/packages/vote-example/package.json +++ b/packages/vote-example/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-sdk-example", + "name": "@waku/vote-sdk-example", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", @@ -33,10 +33,10 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", - "@dappconnect/vote-sdk-react-components": "^0.1.0", - "@dappconnect/vote-sdk-react-hooks": "^0.1.0", - "@dappconnect/vote-poll-sdk-react-components": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", + "@waku/vote-sdk-react-components": "^0.1.0", + "@waku/vote-sdk-react-hooks": "^0.1.0", + "@waku/vote-poll-sdk-react-components": "^0.1.0", "@usedapp/core": "^0.4.7", "ethers": "^5.4.4", "react": "^17.0.2", diff --git a/packages/vote-example/src/components/Voting.tsx b/packages/vote-example/src/components/Voting.tsx index 2a94d86..eecdb3f 100644 --- a/packages/vote-example/src/components/Voting.tsx +++ b/packages/vote-example/src/components/Voting.tsx @@ -5,14 +5,14 @@ import { VotingRoomList, VotingRoomListEmpty, NewVotingRoomModal, -} from '@dappconnect/vote-sdk-react-components' -import { blueTheme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { useTokenBalance } from '@dappconnect/vote-poll-sdk-react-components' +} from '@waku/vote-sdk-react-components' +import { blueTheme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { useTokenBalance } from '@waku/vote-poll-sdk-react-components' import { useEthers } from '@usedapp/core' -import { Modal, Networks, useMobileVersion, Theme } from '@dappconnect/vote-poll-sdk-react-components' -import { useVotingRoomsId } from '@dappconnect/vote-sdk-react-hooks' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { Modal, Networks, useMobileVersion, Theme } from '@waku/vote-poll-sdk-react-components' +import { useVotingRoomsId } from '@waku/vote-sdk-react-hooks' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' import { useHistory } from 'react-router' type VotingListHeaderProps = { diff --git a/packages/vote-example/src/components/VotingMobile.tsx b/packages/vote-example/src/components/VotingMobile.tsx index 68030a7..3169095 100644 --- a/packages/vote-example/src/components/VotingMobile.tsx +++ b/packages/vote-example/src/components/VotingMobile.tsx @@ -2,10 +2,10 @@ import React from 'react' import { Redirect, Route, Switch, useHistory } from 'react-router' import { BrowserRouter } from 'react-router-dom' import styled from 'styled-components' -import { VotingRoomMobile, NewVotingRoomMobile } from '@dappconnect/vote-sdk-react-components' +import { VotingRoomMobile, NewVotingRoomMobile } from '@waku/vote-sdk-react-components' import { Voting } from './Voting' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { useTokenBalance } from '@dappconnect/vote-poll-sdk-react-components' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { useTokenBalance } from '@waku/vote-poll-sdk-react-components' type VotingRoomCreationProps = { tokenBalance: number diff --git a/packages/vote-example/src/index.tsx b/packages/vote-example/src/index.tsx index 53e8bbf..b578cf6 100644 --- a/packages/vote-example/src/index.tsx +++ b/packages/vote-example/src/index.tsx @@ -1,11 +1,11 @@ import React, { useRef } from 'react' -import { useWakuVoting } from '@dappconnect/vote-sdk-react-hooks' +import { useWakuVoting } from '@waku/vote-sdk-react-hooks' import { VotingMobile } from './components/VotingMobile' import { Voting } from './components/Voting' -import { TopBar, GlobalStyle, useMobileVersion } from '@dappconnect/vote-poll-sdk-react-components' +import { TopBar, GlobalStyle, useMobileVersion } from '@waku/vote-poll-sdk-react-components' import votingIcon from './assets/images/voting.png' import styled from 'styled-components' -import { blueTheme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { blueTheme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' import { DAppProvider, ChainId, useEthers, useConfig } from '@usedapp/core' import { DEFAULT_CONFIG } from '@usedapp/core/dist/cjs/src/model/config/default' diff --git a/packages/vote-react-components/package.json b/packages/vote-react-components/package.json index 0b7faa8..9766c01 100644 --- a/packages/vote-react-components/package.json +++ b/packages/vote-react-components/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-sdk-react-components", + "name": "@waku/vote-sdk-react-components", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", @@ -33,9 +33,9 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", - "@dappconnect/vote-sdk-react-hooks": "^0.1.0", - "@dappconnect/vote-poll-sdk-react-components": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", + "@waku/vote-sdk-react-hooks": "^0.1.0", + "@waku/vote-poll-sdk-react-components": "^0.1.0", "ethers": "^5.4.4", "humanize-duration": "^3.27.0", "react": "^17.0.2", diff --git a/packages/vote-react-components/src/components/Buttons.tsx b/packages/vote-react-components/src/components/Buttons.tsx index 5b29967..7cb5262 100644 --- a/packages/vote-react-components/src/components/Buttons.tsx +++ b/packages/vote-react-components/src/components/Buttons.tsx @@ -1,4 +1,4 @@ -import { Button } from '@dappconnect/vote-poll-sdk-react-components' +import { Button } from '@waku/vote-poll-sdk-react-components' import styled from 'styled-components' export const Btn = styled(Button)` diff --git a/packages/vote-react-components/src/components/NotificationItem.tsx b/packages/vote-react-components/src/components/NotificationItem.tsx index 0875dce..c58b08b 100644 --- a/packages/vote-react-components/src/components/NotificationItem.tsx +++ b/packages/vote-react-components/src/components/NotificationItem.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' -import { blueTheme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' -import { CloseButton } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/components/misc/Buttons' +import { blueTheme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { CloseButton } from '@waku/vote-poll-sdk-react-components/dist/esm/src/components/misc/Buttons' import styled from 'styled-components' import { NotificationLink } from './ViewLink' diff --git a/packages/vote-react-components/src/components/ProposalInfo.tsx b/packages/vote-react-components/src/components/ProposalInfo.tsx index ad2eabd..030e9ca 100644 --- a/packages/vote-react-components/src/components/ProposalInfo.tsx +++ b/packages/vote-react-components/src/components/ProposalInfo.tsx @@ -1,4 +1,4 @@ -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' import React from 'react' import styled from 'styled-components' import { ViewLink } from './ViewLink' diff --git a/packages/vote-react-components/src/components/ProposalVoteCard/ProposalVote.tsx b/packages/vote-react-components/src/components/ProposalVoteCard/ProposalVote.tsx index 5f76a97..948f8d7 100644 --- a/packages/vote-react-components/src/components/ProposalVoteCard/ProposalVote.tsx +++ b/packages/vote-react-components/src/components/ProposalVoteCard/ProposalVote.tsx @@ -4,8 +4,8 @@ import { FinalBtn, VoteBtnAgainst, VoteBtnFor } from '../Buttons' import { VoteSubmitButton } from './VoteSubmitButton' import { VoteChart } from './VoteChart' import { ViewLink } from '../ViewLink' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuVoting } from '@waku/vote-poll-sdk-core' interface ProposalVoteProps { votingRoom: VotingRoom diff --git a/packages/vote-react-components/src/components/ProposalVoteCard/VoteChart.tsx b/packages/vote-react-components/src/components/ProposalVoteCard/VoteChart.tsx index 0c82198..40436a1 100644 --- a/packages/vote-react-components/src/components/ProposalVoteCard/VoteChart.tsx +++ b/packages/vote-react-components/src/components/ProposalVoteCard/VoteChart.tsx @@ -8,9 +8,9 @@ import crossIcon from '../../assets/svg/cross.svg' import crossWinnerIcon from '../../assets/svg/crossWinner.svg' import checkIcon from '../../assets/svg/check.svg' import checkWinnerIcon from '../../assets/svg/checkWinner.svg' -import { useMobileVersion } from '@dappconnect/vote-poll-sdk-react-components' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { useMobileVersion } from '@waku/vote-poll-sdk-react-components' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuVoting } from '@waku/vote-poll-sdk-core' export interface VoteChartProps { votingRoom: VotingRoom diff --git a/packages/vote-react-components/src/components/VoteModal/AmountModal.tsx b/packages/vote-react-components/src/components/VoteModal/AmountModal.tsx index cc3e28e..088b07e 100644 --- a/packages/vote-react-components/src/components/VoteModal/AmountModal.tsx +++ b/packages/vote-react-components/src/components/VoteModal/AmountModal.tsx @@ -3,8 +3,8 @@ import styled from 'styled-components' import { VoteChart } from '../ProposalVoteCard/VoteChart' import { DisabledButton, VoteBtnAgainst, VoteBtnFor } from '../Buttons' import { VotePropose } from '../VotePropose' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuVoting } from '@waku/vote-poll-sdk-core' import { BigNumber } from 'ethers' export interface AmountModalProps { diff --git a/packages/vote-react-components/src/components/VoteModal/ConfirmModal.tsx b/packages/vote-react-components/src/components/VoteModal/ConfirmModal.tsx index f34d7e6..c250bc4 100644 --- a/packages/vote-react-components/src/components/VoteModal/ConfirmModal.tsx +++ b/packages/vote-react-components/src/components/VoteModal/ConfirmModal.tsx @@ -1,5 +1,5 @@ -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' import React from 'react' import styled from 'styled-components' import { FinalBtn } from '../Buttons' diff --git a/packages/vote-react-components/src/components/VoteModal/VoteModal.tsx b/packages/vote-react-components/src/components/VoteModal/VoteModal.tsx index b55df4c..bc86d69 100644 --- a/packages/vote-react-components/src/components/VoteModal/VoteModal.tsx +++ b/packages/vote-react-components/src/components/VoteModal/VoteModal.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useMemo, useState } from 'react' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' -import { Modal, Theme } from '@dappconnect/vote-poll-sdk-react-components' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { Modal, Theme } from '@waku/vote-poll-sdk-react-components' import { AmountModal } from './AmountModal' import { ConfirmModal } from './ConfirmModal' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { WakuVoting } from '@waku/vote-poll-sdk-core' export interface VoteModalProps { setShowModal: (val: boolean) => void diff --git a/packages/vote-react-components/src/components/VotePropose.tsx b/packages/vote-react-components/src/components/VotePropose.tsx index de75f73..4d66f60 100644 --- a/packages/vote-react-components/src/components/VotePropose.tsx +++ b/packages/vote-react-components/src/components/VotePropose.tsx @@ -1,4 +1,4 @@ -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { WakuVoting } from '@waku/vote-poll-sdk-core' import React, { useCallback, useMemo } from 'react' import { useState } from 'react' import styled from 'styled-components' diff --git a/packages/vote-react-components/src/components/VotingRoomCard.tsx b/packages/vote-react-components/src/components/VotingRoomCard.tsx index 5a6a9d3..f963653 100644 --- a/packages/vote-react-components/src/components/VotingRoomCard.tsx +++ b/packages/vote-react-components/src/components/VotingRoomCard.tsx @@ -1,13 +1,13 @@ import React, { ReactElement, useCallback, useState, useRef, useMemo } from 'react' import styled from 'styled-components' -import { Theme } from '@dappconnect/vote-poll-sdk-react-components' +import { Theme } from '@waku/vote-poll-sdk-react-components' import { ProposalInfo } from './ProposalInfo' import { ProposalVote } from './ProposalVoteCard/ProposalVote' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { useVotingRoom } from '@dappconnect/vote-sdk-react-hooks' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { useVotingRoom } from '@waku/vote-sdk-react-hooks' import { VoteModal, VoteModalProps } from './VoteModal/VoteModal' -import { useRefMobileVersion } from '@dappconnect/vote-poll-sdk-react-components' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { useRefMobileVersion } from '@waku/vote-poll-sdk-react-components' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' interface VotingRoomCardProps { votingRoomId: number diff --git a/packages/vote-react-components/src/components/VotingRoomList.tsx b/packages/vote-react-components/src/components/VotingRoomList.tsx index 243d6f2..e2962c9 100644 --- a/packages/vote-react-components/src/components/VotingRoomList.tsx +++ b/packages/vote-react-components/src/components/VotingRoomList.tsx @@ -1,10 +1,10 @@ import React from 'react' import styled from 'styled-components' -import { Theme } from '@dappconnect/vote-poll-sdk-react-components' +import { Theme } from '@waku/vote-poll-sdk-react-components' import { VotingRoomCard } from './VotingRoomCard' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { WakuVoting } from '@waku/vote-poll-sdk-core' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' type VotingRoomListProps = { theme: Theme diff --git a/packages/vote-react-components/src/components/VotingRoomListEmpty.tsx b/packages/vote-react-components/src/components/VotingRoomListEmpty.tsx index b8b93d5..f71da4b 100644 --- a/packages/vote-react-components/src/components/VotingRoomListEmpty.tsx +++ b/packages/vote-react-components/src/components/VotingRoomListEmpty.tsx @@ -1,6 +1,6 @@ import React from 'react' import styled from 'styled-components' -import { CreateButton, Theme } from '@dappconnect/vote-poll-sdk-react-components' +import { CreateButton, Theme } from '@waku/vote-poll-sdk-react-components' type VotingRoomListEmptyProps = { theme: Theme diff --git a/packages/vote-react-components/src/components/VotingRoomListHeader.tsx b/packages/vote-react-components/src/components/VotingRoomListHeader.tsx index 1a34ef4..820932c 100644 --- a/packages/vote-react-components/src/components/VotingRoomListHeader.tsx +++ b/packages/vote-react-components/src/components/VotingRoomListHeader.tsx @@ -1,7 +1,7 @@ import React from 'react' import styled from 'styled-components' -import { CreateButton } from '@dappconnect/vote-poll-sdk-react-components' -import { Theme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { CreateButton } from '@waku/vote-poll-sdk-react-components' +import { Theme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' type VotingRoomListHeaderProps = { theme: Theme diff --git a/packages/vote-react-components/src/components/mobile/NewVotingRoomMobile.tsx b/packages/vote-react-components/src/components/mobile/NewVotingRoomMobile.tsx index c874e44..960fde2 100644 --- a/packages/vote-react-components/src/components/mobile/NewVotingRoomMobile.tsx +++ b/packages/vote-react-components/src/components/mobile/NewVotingRoomMobile.tsx @@ -3,7 +3,7 @@ import styled from 'styled-components' import { CardHeading } from '../ProposalInfo' import { VotingRoomDetailInput, ProposingData } from '../newVoteModal/VotingRoomDetailInput' import { TokenAmountScreen } from '../newVoteModal/TokenAmountScreen' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { WakuVoting } from '@waku/vote-poll-sdk-core' interface NewVotingRoomMobileProps { availableAmount: number diff --git a/packages/vote-react-components/src/components/mobile/VotingRoomMobile.tsx b/packages/vote-react-components/src/components/mobile/VotingRoomMobile.tsx index 998d968..1daec55 100644 --- a/packages/vote-react-components/src/components/mobile/VotingRoomMobile.tsx +++ b/packages/vote-react-components/src/components/mobile/VotingRoomMobile.tsx @@ -7,8 +7,8 @@ import { VoteChart } from '../ProposalVoteCard/VoteChart' import { ProposalInfo } from '../ProposalInfo' import { VotePropose } from '../VotePropose' import { VotesBtns } from '../ProposalVoteCard/ProposalVote' -import { useVotingRoom } from '@dappconnect/vote-sdk-react-hooks' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { useVotingRoom } from '@waku/vote-sdk-react-hooks' +import { WakuVoting } from '@waku/vote-poll-sdk-core' import { BigNumber } from 'ethers' interface VotingRoomMobileProps { wakuVoting: WakuVoting diff --git a/packages/vote-react-components/src/components/newVoteModal/NewVotingRoomModal.tsx b/packages/vote-react-components/src/components/newVoteModal/NewVotingRoomModal.tsx index 621e9b3..97bb588 100644 --- a/packages/vote-react-components/src/components/newVoteModal/NewVotingRoomModal.tsx +++ b/packages/vote-react-components/src/components/newVoteModal/NewVotingRoomModal.tsx @@ -1,5 +1,5 @@ -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { Modal, Theme } from '@dappconnect/vote-poll-sdk-react-components' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { Modal, Theme } from '@waku/vote-poll-sdk-react-components' import React, { useEffect, useState } from 'react' import { VotingRoomDetailInput } from './VotingRoomDetailInput' import { TokenAmountScreen } from './TokenAmountScreen' diff --git a/packages/vote-react-components/src/components/newVoteModal/TokenAmountScreen.tsx b/packages/vote-react-components/src/components/newVoteModal/TokenAmountScreen.tsx index 41e181d..684ef71 100644 --- a/packages/vote-react-components/src/components/newVoteModal/TokenAmountScreen.tsx +++ b/packages/vote-react-components/src/components/newVoteModal/TokenAmountScreen.tsx @@ -1,4 +1,4 @@ -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { WakuVoting } from '@waku/vote-poll-sdk-core' import { useEthers } from '@usedapp/core' import React, { useState } from 'react' import styled from 'styled-components' diff --git a/packages/vote-react-components/src/components/newVoteModal/VotingRoomDetailInput.tsx b/packages/vote-react-components/src/components/newVoteModal/VotingRoomDetailInput.tsx index 0840226..703797b 100644 --- a/packages/vote-react-components/src/components/newVoteModal/VotingRoomDetailInput.tsx +++ b/packages/vote-react-components/src/components/newVoteModal/VotingRoomDetailInput.tsx @@ -2,8 +2,8 @@ import React, { useMemo } from 'react' import styled from 'styled-components' import { ProposingBtn } from '../Buttons' import { TextArea } from '../Input' -import { blueTheme } from '@dappconnect/vote-poll-sdk-react-components/dist/esm/src/style/themes' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { blueTheme } from '@waku/vote-poll-sdk-react-components/dist/esm/src/style/themes' +import { WakuVoting } from '@waku/vote-poll-sdk-core' interface VotingRoomDetailInputProps { availableAmount: number diff --git a/packages/vote-react-hooks/package.json b/packages/vote-react-hooks/package.json index 067b54f..2aa4a58 100644 --- a/packages/vote-react-hooks/package.json +++ b/packages/vote-react-hooks/package.json @@ -1,5 +1,5 @@ { - "name": "@dappconnect/vote-sdk-react-hooks", + "name": "@waku/vote-sdk-react-hooks", "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", @@ -27,7 +27,7 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@dappconnect/vote-poll-sdk-core": "^0.1.0", + "@waku/vote-poll-sdk-core": "^0.1.0", "ethers": "^5.4.4", "react": "^17.0.2", "styled-components": "^5.3.0" diff --git a/packages/vote-react-hooks/src/hooks/useVotingRoom.ts b/packages/vote-react-hooks/src/hooks/useVotingRoom.ts index 903e132..a773404 100644 --- a/packages/vote-react-hooks/src/hooks/useVotingRoom.ts +++ b/packages/vote-react-hooks/src/hooks/useVotingRoom.ts @@ -1,6 +1,6 @@ import React, { useEffect, useState, useRef } from 'react' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' export function useVotingRoom(id: number, wakuVoting: WakuVoting) { const [votingRoom, setVotingRoom] = useState(undefined) diff --git a/packages/vote-react-hooks/src/hooks/useVotingRoomsId.ts b/packages/vote-react-hooks/src/hooks/useVotingRoomsId.ts index 14014de..0629e23 100644 --- a/packages/vote-react-hooks/src/hooks/useVotingRoomsId.ts +++ b/packages/vote-react-hooks/src/hooks/useVotingRoomsId.ts @@ -1,6 +1,6 @@ import { id } from '@ethersproject/hash' -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' -import { VotingRoom } from '@dappconnect/vote-poll-sdk-core/dist/esm/src/types/PollType' +import { WakuVoting } from '@waku/vote-poll-sdk-core' +import { VotingRoom } from '@waku/vote-poll-sdk-core/dist/esm/src/types/PollType' import React, { useEffect, useRef, useState } from 'react' export function useVotingRoomsId(wakuVoting: WakuVoting) { diff --git a/packages/vote-react-hooks/src/hooks/useWakuVoting.ts b/packages/vote-react-hooks/src/hooks/useWakuVoting.ts index aef9357..295db38 100644 --- a/packages/vote-react-hooks/src/hooks/useWakuVoting.ts +++ b/packages/vote-react-hooks/src/hooks/useWakuVoting.ts @@ -1,4 +1,4 @@ -import { WakuVoting } from '@dappconnect/vote-poll-sdk-core' +import { WakuVoting } from '@waku/vote-poll-sdk-core' import React, { useEffect, useRef, useState } from 'react' import { Web3Provider } from '@ethersproject/providers' From 01cd334c29040018404675a732be94b0ae052eed Mon Sep 17 00:00:00 2001 From: Franck Date: Thu, 23 Dec 2021 16:04:58 +1100 Subject: [PATCH 3/5] s/dappconnect/wakuconnect --- package.json | 2 +- packages/contracts/package.json | 2 +- packages/core/package.json | 2 +- packages/example/package.json | 2 +- packages/poll-example/package.json | 2 +- packages/poll-react-components/package.json | 2 +- packages/poll-react-hooks/package.json | 2 +- packages/react-components/package.json | 2 +- packages/vote-example/package.json | 2 +- packages/vote-react-components/package.json | 2 +- packages/vote-react-hooks/package.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index aea1cba..6a20822 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "private": true, "license": "MIT OR Apache-2.0", "engines": { diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 40e476d..e2c68be 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -2,7 +2,7 @@ "name": "@waku/vote-sdk-contracts", "version": "0.0.1", "main": "index.js", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "license": "MIT OR Apache-2.0", "scripts": { "clean:all": "yarn clean && rimraf node_modules/", diff --git a/packages/core/package.json b/packages/core/package.json index 0f622c6..f0a175a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk-core", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", "types": "dist/esm/src/index.d.ts", diff --git a/packages/example/package.json b/packages/example/package.json index 38ec74f..9987fe3 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk-example", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "index.js", "license": "MIT OR Apache-2.0", diff --git a/packages/poll-example/package.json b/packages/poll-example/package.json index 1f649e1..77f1064 100644 --- a/packages/poll-example/package.json +++ b/packages/poll-example/package.json @@ -1,6 +1,6 @@ { "name": "@waku/poll-sdk-example", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/poll-react-components/package.json b/packages/poll-react-components/package.json index f3a42bb..08988e9 100644 --- a/packages/poll-react-components/package.json +++ b/packages/poll-react-components/package.json @@ -1,6 +1,6 @@ { "name": "@waku/poll-sdk-react-components", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/poll-react-hooks/package.json b/packages/poll-react-hooks/package.json index 3a03357..3e1816e 100644 --- a/packages/poll-react-hooks/package.json +++ b/packages/poll-react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@waku/poll-sdk-react-hooks", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/react-components/package.json b/packages/react-components/package.json index a44d6b6..49d36aa 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk-react-components", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", "types": "dist/esm/src/index.d.ts", diff --git a/packages/vote-example/package.json b/packages/vote-example/package.json index cb1fa39..5c79021 100644 --- a/packages/vote-example/package.json +++ b/packages/vote-example/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-sdk-example", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/vote-react-components/package.json b/packages/vote-react-components/package.json index 9766c01..3a12702 100644 --- a/packages/vote-react-components/package.json +++ b/packages/vote-react-components/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-sdk-react-components", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/vote-react-hooks/package.json b/packages/vote-react-hooks/package.json index 2aa4a58..c715d62 100644 --- a/packages/vote-react-hooks/package.json +++ b/packages/vote-react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-sdk-react-hooks", - "repository": "git@github.com:status-im/dappconnect-vote-poll-sdk.git", + "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", From ebfb2846f409cccb2cf263e02f612fdabd8bf9fe Mon Sep 17 00:00:00 2001 From: Franck Date: Thu, 23 Dec 2021 16:09:45 +1100 Subject: [PATCH 4/5] Fix repo url --- package.json | 2 +- packages/contracts/package.json | 2 +- packages/core/package.json | 2 +- packages/example/package.json | 2 +- packages/poll-example/package.json | 2 +- packages/poll-react-components/package.json | 2 +- packages/poll-react-hooks/package.json | 2 +- packages/react-components/package.json | 2 +- packages/vote-example/package.json | 2 +- packages/vote-react-components/package.json | 2 +- packages/vote-react-hooks/package.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 6a20822..89c04e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "private": true, "license": "MIT OR Apache-2.0", "engines": { diff --git a/packages/contracts/package.json b/packages/contracts/package.json index e2c68be..cd9e001 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -2,7 +2,7 @@ "name": "@waku/vote-sdk-contracts", "version": "0.0.1", "main": "index.js", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "license": "MIT OR Apache-2.0", "scripts": { "clean:all": "yarn clean && rimraf node_modules/", diff --git a/packages/core/package.json b/packages/core/package.json index f0a175a..e7e51b3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk-core", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", "types": "dist/esm/src/index.d.ts", diff --git a/packages/example/package.json b/packages/example/package.json index 9987fe3..0d13cca 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk-example", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "index.js", "license": "MIT OR Apache-2.0", diff --git a/packages/poll-example/package.json b/packages/poll-example/package.json index 77f1064..9c68613 100644 --- a/packages/poll-example/package.json +++ b/packages/poll-example/package.json @@ -1,6 +1,6 @@ { "name": "@waku/poll-sdk-example", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/poll-react-components/package.json b/packages/poll-react-components/package.json index 08988e9..5b6e961 100644 --- a/packages/poll-react-components/package.json +++ b/packages/poll-react-components/package.json @@ -1,6 +1,6 @@ { "name": "@waku/poll-sdk-react-components", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/poll-react-hooks/package.json b/packages/poll-react-hooks/package.json index 3e1816e..7fd0466 100644 --- a/packages/poll-react-hooks/package.json +++ b/packages/poll-react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@waku/poll-sdk-react-hooks", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 49d36aa..21918c2 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-poll-sdk-react-components", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", "types": "dist/esm/src/index.d.ts", diff --git a/packages/vote-example/package.json b/packages/vote-example/package.json index 5c79021..bdec58a 100644 --- a/packages/vote-example/package.json +++ b/packages/vote-example/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-sdk-example", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/vote-react-components/package.json b/packages/vote-react-components/package.json index 3a12702..af1d0a1 100644 --- a/packages/vote-react-components/package.json +++ b/packages/vote-react-components/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-sdk-react-components", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", diff --git a/packages/vote-react-hooks/package.json b/packages/vote-react-hooks/package.json index c715d62..eb0f7a5 100644 --- a/packages/vote-react-hooks/package.json +++ b/packages/vote-react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@waku/vote-sdk-react-hooks", - "repository": "git@github.com:status-im/wakuconnect-vote-poll-sdk.git", + "repository": "https://github.com/status-im/wakuconnect-vote-poll-sdk", "version": "0.1.0", "main": "dist/cjs/src/index.js", "module": "dist/esm/src/index.js", From a4209d667a44989616f3dbc1649f09f0be63cc72 Mon Sep 17 00:00:00 2001 From: Franck Date: Thu, 23 Dec 2021 16:14:06 +1100 Subject: [PATCH 5/5] Fix License --- packages/contracts/contracts/VotingContract.sol | 2 ++ packages/mainnet-poll-example/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/contracts/contracts/VotingContract.sol b/packages/contracts/contracts/VotingContract.sol index 09beda4..b60a707 100644 --- a/packages/contracts/contracts/VotingContract.sol +++ b/packages/contracts/contracts/VotingContract.sol @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT OR Apache-2.0 + pragma solidity ^0.8.5; import '@openzeppelin/contracts/token/ERC20/IERC20.sol'; diff --git a/packages/mainnet-poll-example/package.json b/packages/mainnet-poll-example/package.json index 0b9677a..986d594 100644 --- a/packages/mainnet-poll-example/package.json +++ b/packages/mainnet-poll-example/package.json @@ -2,7 +2,7 @@ "name": "@waku/mainnet-poll-sdk-example", "version": "0.1.0", "main": "index.js", - "license": "MIT", + "license": "MIT OR Apache-2.0", "scripts": { "clean:all": "yarn clean && rimraf node_modules/", "clean": "rimraf dist/",