Merge branch 'main' of https://github.com/solana-labs/dapp-scaffold i…

…nto main

README.md

@@ -39,7 +39,7 @@ $ cargo test-bpf
 
 Solana program template in Rust
 
-### src/lib.rs
+### program/src/lib.rs
 * process_instruction function is used to run all calls issued to the smart contract
 
 ## src/actions
@@ -64,4 +64,4 @@ Generic react hooks to interact with token program:
 ## src/views
 
 * home - main page for your app
-* faucet - airdrops SOL on Testnet and Devnet
+* faucet - airdrops SOL on Testnet and Devnet

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@ant-design/pro-layout": "^6.7.0",
+    "@ant-design/icons": "^4.5.0",
     "@craco/craco": "^5.7.0",
     "@ledgerhq/hw-transport-webusb": "^5.41.0",
     "@project-serum/serum": "^0.13.25",
@@ -14,24 +14,18 @@
     "@solana/web3.js": "^0.86.2",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
-    "@testing-library/user-event": "^7.2.1",
     "@types/react-router-dom": "^5.1.6",
     "antd": "^4.6.6",
     "bn.js": "^5.1.3",
     "bs58": "^4.0.1",
     "buffer-layout": "^1.2.0",
-    "chart.js": "^2.9.4",
     "craco-less": "^1.17.0",
     "eventemitter3": "^4.0.7",
-    "identicon.js": "^2.3.3",
     "jazzicon": "^1.5.0",
-    "lodash": "^4.17.20",
+    "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-github-btn": "^1.2.0",
-    "react-intl": "^5.10.2",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.3",
-    "react": "^16.13.1",
     "typescript": "^4.0.0"
   },
   "scripts": {
@@ -71,13 +65,12 @@
   "devDependencies": {
     "@types/bn.js": "^4.11.6",
     "@types/bs58": "^4.0.1",
-    "@types/identicon.js": "^2.3.0",
     "@types/jest": "^24.9.1",
-    "@types/ledgerhq__hw-transport-webusb": "^4.70.1",
     "@types/ledgerhq__hw-transport": "^4.21.3",
+    "@types/ledgerhq__hw-transport-webusb": "^4.70.1",
     "@types/node": "^12.12.62",
-    "@types/react-dom": "^16.9.8",
     "@types/react": "^16.9.50",
+    "@types/react-dom": "^16.9.8",
     "arweave-deploy": "^1.9.1",
     "gh-pages": "^3.1.0",
     "prettier": "^2.1.2"