Skip to content

Commit c84b740

Browse files
committed
Merge remote-tracking branch 'origin/main' into dev
2 parents d1ca5df + f01b810 commit c84b740

File tree

5 files changed

+36
-12
lines changed

5 files changed

+36
-12
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ PR reminders:
88
Tips for good PR etiquette https://github.blog/2015-01-21-how-to-write-the-perfect-pull-request/
99
-->
1010

11-
cc/ @kyranjamie @fbwoolf
11+
cc/ @kyranjamie @fbwoolf @beguene @He1DAr

.github/workflows/code-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: ./.github/actions/provision
3434

3535
- name: Audit
36-
run: yarn audit-ci --high
36+
run: yarn audit-ci --high --skip-dev
3737

3838
typecheck:
3939
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
# [3.5.0](https://github.com/hirosystems/stacks-wallet-web/compare/v3.4.0...v3.5.0) (2022-03-22)
2+
3+
4+
### Bug Fixes
5+
6+
* re-add dependency array for getAccountDisplayName usage ([9a40fd8](https://github.com/hirosystems/stacks-wallet-web/commit/9a40fd87dd2853ab724921e5443452dc117c955f))
7+
* remove conditional code for post conditions in fts ([16624e2](https://github.com/hirosystems/stacks-wallet-web/commit/16624e2918d7ca4ca1187a8ddfbc5d2aaf49dd67))
8+
9+
10+
### Features
11+
12+
* revert "Release/2022 03 02 white buffalo" ([3dee883](https://github.com/hirosystems/stacks-wallet-web/commit/3dee883878fc788426754910f8a20655aea335d2))
13+
* show account username suffices ([289b44d](https://github.com/hirosystems/stacks-wallet-web/commit/289b44dd45bf8b18966261bbb371749d296f3450))
14+
15+
# [3.4.0](https://github.com/hirosystems/stacks-wallet-web/compare/v3.3.0...v3.4.0) (2022-03-21)
16+
17+
18+
### Bug Fixes
19+
20+
* pull request template cc ([756aa4a](https://github.com/hirosystems/stacks-wallet-web/commit/756aa4a9bc718d236a36621c804dbc9a602f6afc))
21+
22+
23+
### Features
24+
25+
* force trigger release ([222a448](https://github.com/hirosystems/stacks-wallet-web/commit/222a448737b4a0ba5cc36205dfebbf26fa181d6f))
26+
* force trigger release redo ([b8c9f87](https://github.com/hirosystems/stacks-wallet-web/commit/b8c9f874380432a9eaae70000092f295be5cd862))
27+
* force trigger version action ([7f4e4dc](https://github.com/hirosystems/stacks-wallet-web/commit/7f4e4dcb84f7f9f2f71c43adf01a477c1f3704de))
28+
129
# [3.3.0](https://github.com/hirosystems/stacks-wallet-web/compare/v3.2.1...v3.3.0) (2022-03-16)
230

331

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@stacks/wallet-web",
33
"description": "The Hiro Wallet is browser extension for interacting with Stacks apps.",
44
"private": true,
5-
"version": "3.3.0",
5+
"version": "3.5.0",
66
"author": "Hiro Systems PBC",
77
"scripts": {
88
"dev": "concurrently --raw 'node webpack/dev-server.js' 'redux-devtools --hostname=localhost --port=8000'",
@@ -274,6 +274,7 @@
274274
"dot-prop": "6.0.1",
275275
"hosted-git-info": "4.0.2",
276276
"immer": "9.0.6",
277+
"minimist": "npm:[email protected]",
277278
"mixme": "0.5.2",
278279
"node-fetch": "2.6.7",
279280
"normalize-url": "4.5.1",

yarn.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14442,15 +14442,10 @@ [email protected]:
1444214442
is-plain-obj "^1.1.0"
1444314443
kind-of "^6.0.3"
1444414444

14445-
14446-
version "1.2.0"
14447-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
14448-
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
14449-
14450-
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
14451-
version "1.2.5"
14452-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
14453-
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
14445+
[email protected], minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, "minimist@npm:[email protected]":
14446+
version "2.2.0"
14447+
resolved "https://registry.yarnpkg.com/minimist-lite/-/minimist-lite-2.2.0.tgz#43992acac6bb17e78acb6eee784d1da2f7cc3216"
14448+
integrity sha512-o9M0Iz5ELqCT4NzeaZHBBlV4+ruOGGWV6lVxFoghC6Wvp4W6ECbBBpmDRHdk72O/sMh3QT0c/0XDKhtGlztRZw==
1445414449

1445514450
minipass@^2.6.0, minipass@^2.9.0:
1445614451
version "2.9.0"

0 commit comments

Comments
 (0)