Merge pull request #207 from zkBob/staging

v3.0.0
zkBob · Jul 13, 2023 · 31d87eb · 31d87eb
2 parents cdeed16 + f5de8a4
commit 31d87eb
Show file tree

Hide file tree

Showing 58 changed files with 3,664 additions and 755 deletions.
diff --git a/.github/workflows/merge-branch.yml b/.github/workflows/merge-branch.yml
@@ -0,0 +1,18 @@
+name: Sync pre-prod branch
+on:
+  push:
+    branches:
+      - 'staging'
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge staging -> pre-prod
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: staging
+          target_branch: pre-prod
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zkbob-ui",
-  "version": "2.3.0",
+  "version": "3.0.0",
   "private": true,
   "dependencies": {
     "@dicebear/avatars": "^4.10.2",
@@ -44,7 +44,7 @@
     "wagmi": "^0.12.1",
     "web-vitals": "^1.0.1",
     "webpack": "^5.70.0",
-    "zkbob-client-js": "4.0.1"
+    "zkbob-client-js": "5.1.0"
   },
   "scripts": {
     "start": "react-app-rewired start",

diff --git a/src/assets/check-stroke.svg b/src/assets/check-stroke.svg
diff --git a/src/assets/eth.svg b/src/assets/eth.svg
diff --git a/src/assets/ethereum.svg b/src/assets/ethereum.svg
diff --git a/src/assets/goerli.svg b/src/assets/goerli.svg
diff --git a/src/assets/polygon.svg b/src/assets/polygon.svg