diff --git a/package-lock.json b/package-lock.json index 1bbd6d61..8a6c3d8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4374,8 +4374,8 @@ "integrity": "sha512-NK9DBBYEBb5f9D7zXI0hiE941gq3wkBeQmXs1ingigA/jnTg5mhwY2Z5egwA+ZI8OLGKCx0h1Cl8/xeuIBuLlg==" }, "electrum-client": { - "version": "git+https://github.com/BlueWallet/rn-electrum-client.git#aa73cd8bb3f2d6aefd7c054cb08d5bf5151d1cbb", - "from": "git+https://github.com/BlueWallet/rn-electrum-client.git#aa73cd8bb3f2d6aefd7c054cb08d5bf5151d1cbb" + "version": "git+https://github.com/BlueWallet/rn-electrum-client.git#4bbd13f3c2b9ae683ee8ec064d770be1f76b23a7", + "from": "git+https://github.com/BlueWallet/rn-electrum-client.git#4bbd13f3c2b9ae683ee8ec064d770be1f76b23a7" }, "elliptic": { "version": "6.5.2", diff --git a/package.json b/package.json index 833c5ae6..e0f0dc4d 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "crypto-js": "3.1.9-1", "dayjs": "1.8.20", "ecurve": "1.0.6", - "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git#aa73cd8bb3f2d6aefd7c054cb08d5bf5151d1cbb", + "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git#4bbd13f3c2b9ae683ee8ec064d770be1f76b23a7", "eslint-config-prettier": "6.10.0", "eslint-config-standard": "12.0.0", "eslint-config-standard-react": "7.0.2", diff --git a/release-notes.sh b/release-notes.sh index 6b3b2f49..e6e2f078 100755 --- a/release-notes.sh +++ b/release-notes.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash TAG=`git tag | sort | tail -n 1` HASH=`git show-ref -s $TAG` -git log --pretty=format:'* %s %b' $HASH..HEAD +git log --pretty=format:'* %s %b' $HASH..HEAD | grep -v "Merge branch 'master'" | grep -v "Merge remote-tracking branch 'origin/master'"