diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5a2344d7..b7ec1624 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
name: continuous-integration
-on: [push, pull_request]
+on: [pull_request]
jobs:
CI:
@@ -18,7 +18,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@master
with:
- node-version: '${{ steps.nvm.outputs.NVMRC }}'
+ node-version: "${{ steps.nvm.outputs.NVMRC }}"
- name: Check for cached node_modules
uses: actions/cache@v2
@@ -36,9 +36,13 @@ jobs:
- name: Lint
run: yarn run lint:ci
- - name: Build
- run: yarn run build
+ # - name: Build
+ # run: yarn run build
# TO-DO: Uncomment when tests are ready to be run on CI (such as those in issues #129-#131)
- # - name: Test
- # run: yarn test:ci
+ - name: Run App
+ run: yarn run dev &
+ sleep 50
+
+ - name: Test
+ run: yarn test
diff --git a/package.json b/package.json
index 00e247f9..20c3bf8d 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"@taquito/tezbridge-wallet": "13.0.1",
"@taquito/tzip12": "13.0.1",
"@taquito/tzip16": "13.0.1",
+ "@testing-library/react": "^13.4.0",
"@types/mixpanel-browser": "^2.35.7",
"@types/prismjs": "^1.26.0",
"@types/react-router-hash-link": "^2.4.5",
@@ -45,6 +46,7 @@
"notistack": "^1.0.3",
"prism-themes": "^1.9.0",
"prismjs": "^1.28.0",
+ "puppeteer": "^19.4.1",
"react": "^17.0.1",
"react-customizable-progressbar": "^1.0.2",
"react-dom": "^17.0.2",
diff --git a/src/modules/common/Toolbar.tsx b/src/modules/common/Toolbar.tsx
index 5d917109..cd155f5b 100644
--- a/src/modules/common/Toolbar.tsx
+++ b/src/modules/common/Toolbar.tsx
@@ -320,6 +320,7 @@ export const Navbar: React.FC<{
color="secondary"
variant="contained"
style={{ fontSize: "14px" }}
+ id="navbar-connect-wallet"
onClick={() => connect()}
>
Connect Wallet
diff --git a/src/modules/common/WarningFooter.tsx b/src/modules/common/WarningFooter.tsx
index e2b7cdc8..e8b19f0e 100644
--- a/src/modules/common/WarningFooter.tsx
+++ b/src/modules/common/WarningFooter.tsx
@@ -53,7 +53,7 @@ export const WarningFooter: React.FC<{ text: string }> = ({ text }) => {
{text}
-
+
diff --git a/src/modules/creator/components/NavigationBar.tsx b/src/modules/creator/components/NavigationBar.tsx
index 218709f6..fd986cfb 100644
--- a/src/modules/creator/components/NavigationBar.tsx
+++ b/src/modules/creator/components/NavigationBar.tsx
@@ -56,7 +56,7 @@ export const NavigationBar: React.FC = ({ back, next }) => {
{back && (
-
+
{back.text}
@@ -64,7 +64,7 @@ export const NavigationBar: React.FC = ({ back, next }) => {
{next && (
-
+
{next.text}
)}
diff --git a/src/modules/creator/steps/DaoSettings.tsx b/src/modules/creator/steps/DaoSettings.tsx
index da30747b..54286d4c 100644
--- a/src/modules/creator/steps/DaoSettings.tsx
+++ b/src/modules/creator/steps/DaoSettings.tsx
@@ -112,6 +112,7 @@ const ErrorText = styled(Typography)({
})
const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, touched, setFieldTouched }: any) => {
+ console.log("values: ", values)
const theme = useTheme()
const isMobile = useMediaQuery(theme.breakpoints.down("md"))
@@ -122,16 +123,17 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors,
} = useTokenMetadata(values?.governanceToken?.address, values?.governanceToken?.tokenId)
useEffect(() => {
+ console.log("tokenMetadata: ", tokenMetadata)
if (tokenMetadata) {
setFieldValue("governanceToken.tokenMetadata", tokenMetadata)
- setFieldValue("symbol", tokenMetadata.symbol)
+ setFieldValue("symbol", tokenMetadata?.symbol)
}
if (error) {
setFieldValue("governanceToken.tokenMetadata", undefined)
setFieldValue("symbol", undefined)
}
- }, [error, setFieldValue, tokenMetadata])
+ }, [tokenMetadata, error, setFieldValue])
const { dispatch } = useContext(CreatorContext)
const match = useRouteMatch()
@@ -183,7 +185,7 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors,
= ({ open, handleClos
-
+
Submit
diff --git a/src/modules/explorer/components/FreezeDialog.tsx b/src/modules/explorer/components/FreezeDialog.tsx
index 5c8c18e8..686ac3af 100644
--- a/src/modules/explorer/components/FreezeDialog.tsx
+++ b/src/modules/explorer/components/FreezeDialog.tsx
@@ -102,7 +102,12 @@ export const FreezeDialog: React.FC<{ freeze: boolean }> = ({ freeze }) => {
return (
-