-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 'master'
Develop See merge request papers/airgap/airgap-vault!335
- Loading branch information
Showing
9 changed files
with
156 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,39 @@ | ||
| <!--- | ||
| Please read this! | ||
| 1. Before opening a new issue, make sure it isn't a duplicate. | ||
| 1. Before opening a new issue, make sure to search for keywords in the issues | ||
| filtered by the "bug" label and verify the issue you're about to submit isn't a duplicate. | ||
| 2. Include the name of the affected component, eg: account-transaction-list or scan-address | ||
| 2. Make sure you're including the name of the affected component if applicable, as an example: | ||
| account-transaction-list or scan-address | ||
| 3. Fill all proposed paragraphs (even with NA, if nothing available) | ||
| ---> | ||
|
|
||
| ### Summary | ||
| ## Summary | ||
| <!--- Summarize the bug encountered concisely ---> | ||
|
|
||
| (Summarize the bug encountered concisely) | ||
|
|
||
| ### Steps to reproduce | ||
| ## Steps to reproduce | ||
| <!--- How one can reproduce the issue - this is very important ---> | ||
|
|
||
| (How one can reproduce the issue - this is very important) | ||
| ## What is the current _bug_ behavior? | ||
| <!--- What actually happens ---> | ||
|
|
||
| ### What is the current _bug_ behavior? | ||
| ## What is the expected _correct_ behavior? | ||
| <!--- What you should see instead ---> | ||
|
|
||
| (What actually happens) | ||
| ## Relevant logs, screenshots and/or links | ||
| <!--- Paste any relevant logs - please use code blocks (```) to format console output, | ||
| logs, and code as it's tough to read otherwise. ---> | ||
|
|
||
| ### What is the expected _correct_ behavior? | ||
| ## Possible fixes / approach | ||
| <!--- If you can, link to the line of code that might be responsible for the problem or describe how to solve it ---> | ||
|
|
||
| (What you should see instead) | ||
| ## Additional information | ||
| <!--- anything that might be important for whoever works with this issue ---> | ||
|
|
||
| ### Relevant logs and/or screenshots | ||
| ---- | ||
| <!--- if you know already how long it takes, add an estimate eg. 2h or 1d ---> | ||
| /estimate | ||
|
|
||
| (Paste any relevant logs - please use code blocks (```) to format console output, | ||
| logs, and code as it's tough to read otherwise.) | ||
| <!--- these standard labels will be added to this issue>---> | ||
| /label ~"type::bug" ~"proj::airgap" | ||
|
|
||
| ### Possible fixes | ||
|
|
||
| (If you can, link to the line of code that might be responsible for the problem) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <!--- | ||
| 1. Before opening a new epic, make sure it isn't a duplicate. | ||
| 2. Give it a good name, summing up the goal to achieve | ||
| 3. After creating the epic, also create a label with the same name | ||
| on the highest group/project level necessary and add it to this issue as well | ||
| ---> | ||
|
|
||
| ## Summary | ||
| <!--- What is the greater goal to achieve with this epic? ---> | ||
|
|
||
|
|
||
|
|
||
| ## Which issues need to be completed | ||
| <!--- List all issues that need to be done. Example: | ||
| - [] papers/airgap/airgap-vault#242+ | ||
| If you use this format, add the + at the end of the path | ||
| ---> | ||
|
|
||
|
|
||
| <!--- --------------------------------------------------- ---> | ||
|
|
||
|
|
||
| <!--- these standard labels will be added to this issue, leave it as it is ---> | ||
| /label ~2141 ~"proj::airgap" | ||
|
|
||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,43 @@ | ||
| <!--- | ||
| Please read this! | ||
| 1. Before opening a new issue, make sure it isn't a duplicate. | ||
| 1. Before opening a new issue, make sure to search for keywords in the issues | ||
| filtered by the "feature" label and verify the issue you're about to submit isn't a duplicate. | ||
| 2. Include the name of the affected component, eg: account-transaction-list or scan-address | ||
| 2. Make sure you're including the name of the affected component if applicable, as an example: | ||
| account-transaction-list or scan-address | ||
| 3. Fill all proposed paragraphs (even with NA, if nothing available) | ||
| ---> | ||
|
|
||
| ### Summary | ||
| ## Summary | ||
| <!--- Summarize the feature concisely ---> | ||
|
|
||
|
|
||
|
|
||
| ## What is the expected behavior? | ||
| <!--- What the user should see / can do ---> | ||
|
|
||
|
|
||
|
|
||
| ## Relevant Mockups, Screenshots and/or links | ||
| <!--- Paste or link any relevant mockups or screenshot that describe the feature. ---> | ||
|
|
||
|
|
||
|
|
||
| ## Possible fixes / approach | ||
| <!--- If you can, link to the line of code that might be responsible for the problem or describe how to solve it ---> | ||
|
|
||
|
|
||
|
|
||
| ## Additional information | ||
| <!--- anything that might be important for whoever works with this issue ) ---> | ||
|
|
||
|
|
||
| (Summarize the feature concisely) | ||
|
|
||
| ### What is the expected behavior? | ||
| <!--- --------------------------------------------------- ---> | ||
|
|
||
| (Describe what the user should see) | ||
| <!--- if you already know, please add an estimate eg. 2h or 1d, else leave it as it is---> | ||
| /estimate | ||
|
|
||
| ### Relevant mockups or screenshots | ||
|
|
||
| (Paste or link any relevant mockups or screenshot that describe the feature.) | ||
|
|
||
| ### Possible approach | ||
| <!--- these standard labels will be added to this issue, leave it as it is ---> | ||
| /label ~"type::feature" ~"proj::airgap" | ||
|
|
||
| (Outline a possible approach for this feature, ex. make an example how the code could look like) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <!--- | ||
| 1. Before opening a new issue, make sure it isn't a duplicate. | ||
| 2. Include the name of the affected component, eg: account-transaction-list or scan-address | ||
| 3. Fill all proposed paragraphs (even with NA, if nothing available) | ||
| ---> | ||
|
|
||
| ## Summary | ||
| <!--- Summarize the task concisely. ---> | ||
|
|
||
|
|
||
|
|
||
| ## What steps need to be done? | ||
| <!--- If it makes sense, list all necessary steps as a tasklist with checkboxes. ---> | ||
|
|
||
|
|
||
|
|
||
| ## Relevant Mockups, Screenshots and/or links | ||
| <!--- Paste or link any relevant mockups or screenshot that help to solve the task. ---> | ||
|
|
||
|
|
||
|
|
||
| ## Additional information | ||
| <!--- anything that might be important for whoever works with this issue. ---> | ||
|
|
||
|
|
||
|
|
||
| <!--- --------------------------------------------------- ---> | ||
|
|
||
| <!--- if you already know, please add an estimate eg. 2h or 1d, else leave it as it is---> | ||
| /estimate | ||
|
|
||
|
|
||
|
|
||
| <!--- these standard labels will be added to this issue, leave it as it is ---> | ||
| /label ~"type::task" ~"proj::airgap" | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 11 additions & 13 deletions
24
ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| { | ||
| "object": { | ||
| "pins": [ | ||
| { | ||
| "package": "AirGapSapling", | ||
| "repositoryURL": "https://github.com/airgap-it/airgap-sapling", | ||
| "state": { | ||
| "branch": null, | ||
| "revision": "c6606fce5d84cea678414681b13ef5efb3629a7e", | ||
| "version": "0.0.6" | ||
| } | ||
| "pins" : [ | ||
| { | ||
| "identity" : "airgap-sapling", | ||
| "kind" : "remoteSourceControl", | ||
| "location" : "https://github.com/airgap-it/airgap-sapling", | ||
| "state" : { | ||
| "revision" : "00848f05c305c9997c8f7325527ddc20de7edd2b", | ||
| "version" : "0.0.7" | ||
| } | ||
| ] | ||
| }, | ||
| "version": 1 | ||
| } | ||
| ], | ||
| "version" : 2 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters