From 859a9b353374cb2a50b89589b14a0fdcede16622 Mon Sep 17 00:00:00 2001
From: P <879913+SpicyPete@users.noreply.github.com>
Date: Mon, 23 Sep 2019 17:06:13 -0700
Subject: [PATCH] Tweaks for 0.11.0 releease (#162)
* Tweaks for 0.11.0 releease
* package not yet working android x
---
CHANGELOG.md | 9 +++++++
README.md | 1 +
.../xcshareddata/WorkspaceSettings.xcsettings | 10 +++++++
screens/FAQScreen.js | 26 ++++++++++---------
screens/KeySweepScreen.js | 16 ++++++++++++
screens/MenuScreen.js | 5 ++--
yarn | 0
7 files changed, 53 insertions(+), 14 deletions(-)
create mode 100644 ios/badgerMobile.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
create mode 100644 yarn
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b8c47b5..627ba240 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Badger Wallet - Changelog
+## 0.11.0
+
+- Larger QR codes
+- Slide to send improvements
+ - Activates earlier in swipe
+- FAQ Page to address common questions
+- Direct link to explorer from each transaction
+- Paper Wallet Sweeping screen added
+
## 0.10.3
- React Native 0.60 upgrade
diff --git a/README.md b/README.md
index aa36cecc..56624542 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ To run on a specific device, such as required for taking screenshots for the sto
```bash
> yarn run ios --simulator="iPhone Xs Max"
+> yarn run ios --simulator="iPhone 11 Pro"
> yarn run ios --simulator="iPhone 8 Plus"
> yarn run ios --simulator="iPhone 6"
> yarn run ios --simulator="iPhone SE"
diff --git a/ios/badgerMobile.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/badgerMobile.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000..6b30c745
--- /dev/null
+++ b/ios/badgerMobile.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+
+
+
+
+ BuildSystemType
+ Original
+ PreviewsEnabled
+
+
+
diff --git a/screens/FAQScreen.js b/screens/FAQScreen.js
index 668f531f..7e95e239 100644
--- a/screens/FAQScreen.js
+++ b/screens/FAQScreen.js
@@ -33,10 +33,10 @@ const FAQScreen = (props: Props) => {
return (
-
+
Badger Wallet is a Bitcoin Cash (BCH) and Simple Token (SLP) wallet,
- made to prioritize simplicity for everyday use.
+ designed to prioritize simplicity for everyday use.
Linking.openURL("https://badger.bitcoin.com")}
@@ -44,10 +44,13 @@ const FAQScreen = (props: Props) => {
badger.bitcoin.com
+
+ Bitcoin Cash (BCH) and Simple Ledger Protocol (SLP) tokens
+
Bitcoin Cash (BCH) is a version of bitcoin which focuses on being
- peer to peer electronic cash for everyone. Learn more at
+ peer to peer for the world. Learn more at
Linking.openURL("https://bitcoincash.org")}
@@ -56,11 +59,11 @@ const FAQScreen = (props: Props) => {
-
+
- Simple tokens are tokens following the Simple Ledger Protocol
- specification which is built upon the Bitcoin Cash network. With
- simple tokens you can tokenize anything and everything easily.
+ SLP tokens are tokens following the Simple Ledger Protocol
+ specification which is built upon the Bitcoin Cash network. With SLP
+ tokens can be created and shared by anyone easily.
Linking.openURL("https://simpleledger.cash")}
@@ -69,12 +72,11 @@ const FAQScreen = (props: Props) => {
-
+
- To send SLP tokens, a small amount of BCH is used to pay for the
- transaction fee. Make sure you have some BCH in your wallet before
- sending SLP tokens. If this isn't the case, and the problem persists
- then please get in contact with the team from the Contact Us page.
+ Receiving tokens is free, but sending requires a little bit of
+ Bitcoin Cash (BCH) to pay the transaction fee. Make sure your wallet
+ has a little bit of BCH before sending SLP tokens.
diff --git a/screens/KeySweepScreen.js b/screens/KeySweepScreen.js
index 28875358..5833b9dc 100644
--- a/screens/KeySweepScreen.js
+++ b/screens/KeySweepScreen.js
@@ -136,6 +136,22 @@ const KeySweepScreen = ({ address }: Props) => {
+ {sweepState === "neutral" && (
+ <>
+
+ To recover Bitcoin Cash (BCH) from a paper wallet, follow the
+ three outlined steps.
+
+
+
+ 1. Scan the private QR code on the paper wallet.
+
+
+ 2. Review details.
+
+ 3. Sweep to your Badger wallet.
+ >
+ )}
{sweepState === "scanned" && (
<>
2. Review Details
diff --git a/screens/MenuScreen.js b/screens/MenuScreen.js
index 469203ee..928fb663 100644
--- a/screens/MenuScreen.js
+++ b/screens/MenuScreen.js
@@ -20,7 +20,7 @@ import { currencySelector } from "../data/prices/selectors";
import { T, Spacer } from "../atoms";
-import packageJson from "../package.json";
+// import packageJson from "../package.json";
const StyledScrollView = styled(ScrollView)`
height: 100%;
@@ -155,7 +155,8 @@ const MenuScreen = ({ navigation, seedViewed, fiatCurrency }: Props) => {
- Version {packageJson.version} - Beta
+ {/* Version {packageJson.version} - Beta */}
+ Version 0.11.0 - Beta
diff --git a/yarn b/yarn
new file mode 100644
index 00000000..e69de29b