From 80400ce701df2a80233f4cc093aa784f4259444f Mon Sep 17 00:00:00 2001 From: Andre Neves Date: Tue, 16 Apr 2019 23:38:02 -0400 Subject: [PATCH] chore: fixes and docs --- DEVELOPMENT_WORKFLOW.md | 6 +++--- app/views/settings.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DEVELOPMENT_WORKFLOW.md b/DEVELOPMENT_WORKFLOW.md index 46cd5bd..a7d4a0b 100644 --- a/DEVELOPMENT_WORKFLOW.md +++ b/DEVELOPMENT_WORKFLOW.md @@ -1,6 +1,6 @@ # Development Workflow -This repository aims to follow the GitFlow paradigm. If you are unfamiliar with GitFlow, please read [Atlassian's GitFlow documentation](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) illustrating the concepts and its advantages. +This repository aims to follow the GitFlow paradigm. If you are unfamiliar with GitFlow, please read [Atlassian's GitFlow documentation](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) which illustrates the concepts and its advantages. # Branching @@ -11,7 +11,7 @@ The following lists the branching semantics to follow: * refactor: describes the refactoring of a portion of the application * `example: refactor/data-fetch-action` - * hotfix: describes a bugfix + * hotfix: describes a bugfix/hotfix * `example: hotfix/header-scroll-bug` ## Commit Messages @@ -31,7 +31,7 @@ Commit messages should have semantic meanings to make it more easily possible to * **revert**: Commits which revert another commit * **type**: Changes specific to static * types (TypeScript, Flow, etc...) -Commits should be isolated to one type. Make sure to keep commits small. This Will help to easily change or revert back to past commits. Additionally, commits can have multi-line messages to better express the commit. +Commits should be isolated to one type. Make sure to keep commits small. This will help to easily change or revert back to past commits. Additionally, commits can have multi-line messages to better express the commit. ``` docs: commit messages doc diff --git a/app/views/settings.js b/app/views/settings.js index d45b812..d79e35b 100644 --- a/app/views/settings.js +++ b/app/views/settings.js @@ -275,6 +275,7 @@ export class SettingsView extends PureComponent { const privateKey = await (address.startsWith('z') ? rpc.z_exportkey(address) : rpc.dumpprivkey(address)); + return { zAddress: address, key: privateKey }; }), )