Skip to content

Commit

Permalink
Merge branch 'develop' into feat/YOEXT-647/swap-ui-page
Browse files Browse the repository at this point in the history
  • Loading branch information
vsubhuman authored Nov 19, 2023
2 parents 7aee2c8 + 0d410c8 commit f7e8834
Show file tree
Hide file tree
Showing 167 changed files with 3,391 additions and 8,335 deletions.
6 changes: 5 additions & 1 deletion build-release.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
if [ $1 = "stable" ];
then RELEASE_TYPE="stable"
elif [ $1 = "stable-mv2" ];
then RELEASE_TYPE="stable-mv2"
elif [ $1 = "nightly" ];
then RELEASE_TYPE="nightly"
elif [ $1 = "nightly-mv2" ];
then RELEASE_TYPE="nightly-mv2"
else
echo "First parameter is expected 'stable' or 'nightly'"
echo "First parameter is expected 'stable', 'stable-mv2', or 'nightly'"
return 1
fi

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"flow": "lerna run flow --stream",
"test": "lerna run test --stream",
"translations:purge": "lerna run translations:purge -- stream",
"dev:all": "concurrently \"npm run dev:stable --prefix packages/yoroi-extension\" \"npm run cardano --prefix packages/yoroi-connector\" \"npm run ergo --prefix packages/yoroi-connector\" "
"dev:all": "concurrently \"npm run dev:stable --prefix packages/yoroi-extension\" \"npm run cardano --prefix packages/yoroi-connector\" "
},
"husky": {
"hooks": {
Expand Down
6 changes: 1 addition & 5 deletions packages/yoroi-connector/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Yoroi dApp Connector

~~This experimental extension is the first in a modular design to interface the [Yoroi frontend extension](https://github.com/Emurgo/yoroi-frontend) with dApps. It targets the [Ergo](https://ergoplatform.org/en/) cryptocurrency.~~

~~The implementation will follow our [EIP-0012](https://github.com/ergoplatform/eips/pull/23) spec.~~

This project is used only as an example application.

All related to the dApp is moved to the folder `packages/yoroi-extension/app/connector`.
Expand All @@ -16,4 +12,4 @@ All related to the dApp is moved to the folder `packages/yoroi-extension/app/con
### Running dApp example page

1. Install node modules
2. Run example for cardano network `npm run cardano` or run example for ergo network `npm run ergo`
2. Run example for cardano network `npm run cardano`
5 changes: 0 additions & 5 deletions packages/yoroi-connector/example-ergo/bootstrap.js

This file was deleted.

Binary file removed packages/yoroi-connector/example-ergo/favicon.ico
Binary file not shown.
48 changes: 0 additions & 48 deletions packages/yoroi-connector/example-ergo/index.html

This file was deleted.

Loading

0 comments on commit f7e8834

Please sign in to comment.