Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gruve-p committed Dec 3, 2023
2 parents f6c28d0 + 6210cb2 commit 32e441d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
## Commits

All commits should have one of the following prefixes: REL, FIX, ADD, REF, TST, OPS, DOC. For example `"ADD: new feature"`.
Adding new feature is ADD, fixing a bug is FIX, something related to infrastructure is OPS etc. REL is for releases, REF is for
refactoring, DOC is for changing documentation (like this file).

Commits should be atomic: one commit - one feature, one commit - one bugfix etc.

## Releases

When you tag a new release, use the following example:
`git tag -m "REL v1.4.0: 157c9c2" v1.4.0 -s`
You may get the commit hash from git log. Don't forget to push tags `git push origin --tags`
Expand All @@ -14,6 +18,10 @@ When tagging a new release, make sure to increment version in package.json and o
In the commit where you up version you can have the commit message as
`"REL vX.X.X: Summary message"`.

## Guidelines

Do *not* add new dependencies. Bonus points if you manage to actually remove a dependency.

All new files must be in typescript. Bonus points if you convert some of the existing files to typescript.

New components must go in `components/`. Bonus points if you refactor some of old components in `BlueComponents.js` to separate files.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@keystonehq/bc-ur-registry": "0.6.4",
"@ngraveio/bc-ur": "1.1.6",
"@noble/secp256k1": "1.6.3",
"@react-native-async-storage/async-storage": "1.19.8",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-native-clipboard/clipboard": "1.12.1",
"@react-native-community/push-notification-ios": "1.11.0",
"@react-navigation/drawer": "6.6.6",
Expand Down Expand Up @@ -149,7 +149,7 @@
"react-native-camera-kit": "13.0.0",
"react-native-crypto": "2.2.0",
"react-native-default-preference": "1.4.4",
"react-native-device-info": "10.11.0",
"react-native-device-info": "10.12.0",
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#b21978d601a9e780e3d563447577f2d5dedb3c9a",
"react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4",
"react-native-elements": "3.4.3",
Expand Down Expand Up @@ -179,7 +179,7 @@
"react-native-safe-area-context": "4.7.4",
"react-native-screens": "3.27.0",
"react-native-secure-key-store": "https://github.com/BlueWallet/react-native-secure-key-store#2076b48",
"react-native-share": "10.0.1",
"react-native-share": "10.0.2",
"react-native-svg": "13.14.0",
"react-native-tcp-socket": "5.6.2",
"react-native-tor": "0.1.8",
Expand Down

0 comments on commit 32e441d

Please sign in to comment.