Merge pull request #104 from Bitcoin-com/develop

Rebrand to green and new logo

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Badger Wallet changelog
 
+## 0.8.0
+
+- Re-branding full app and BCH references from the previous orange colour to the new exciting green colour.
+
+## 0.7.1
+
+- Fixing an edge case app crash
+
 ## 0.7.0
 
 ### Features / Improvements

README.md

@@ -1,8 +1,8 @@
-# Badger Mobile
+# Badger Wallet
 
 > Your gateway to the world of Bitcoin Cash (BCH) apps.
 
-Badger Mobile is a Bitcoin Cash (BCH) and Simple Ledger Protocol (SLP) wallet. The easiest to use mobile wallet for BCH and SLP tokens.
+Badger Wallet is a Bitcoin Cash (BCH) and Simple Ledger Protocol (SLP) wallet. The easiest to use mobile wallet for BCH and SLP tokens.
 
 ## Technologies / Patterns
 
@@ -52,6 +52,8 @@ To run on a specific device
 > yarn run ios --simulator="iPhone SE"
 > yarn run ios --simulator="iPhone X"
 
+> for store screenshots, use XsMax (6.5") and iPhone 8 Plus (5.5")
+
 Deploy Steps
 > Load project in XCode
 > Update version number
@@ -86,6 +88,10 @@ To run production build locally
 > react-native log-android
 ```
 
+### Asset / Icon / Splash Screen Generation
+
+-[https://github.com/bamlab/generator-rn-toolbox](https://github.com/bamlab/generator-rn-toolbox/tree/master/generators/assets)
+
 ### Nuke all and install command, for when things don't work
 
 ```bash

android/app/build.gradle

@@ -105,8 +105,8 @@ android {
         applicationId "com.badgermobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 6
-        versionName "1.4"
+        versionCode 7
+        versionName "1.5"
         missingDimensionStrategy 'react-native-camera', 'general'
     }
     signingConfigs {

android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#008577"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Badger Mobile</string>
+    <string name="app_name">Badger Wallet</string>
 </resources>

atoms/Button/Button.js

@@ -27,6 +27,11 @@ const StyledButton = styled(TouchableOpacity)`
           background-color: transparent;
           border-color: ${props.theme.primary500};
         `
+      : props.nature === "inverse"
+      ? css`
+          background-color: ${props => props.theme.bg900};
+          border-color: ${props.theme.primary700};
+        `
       : css`
           border-color: ${props.theme.primary500};
           background-color: ${props.theme.primary500};
@@ -36,12 +41,17 @@ const StyledButton = styled(TouchableOpacity)`
 type Props = {
   text?: string,
   children?: React.Node,
-  nature?: "primary" | "caution" | "cautionGhost" | "ghost",
+  nature?: "primary" | "caution" | "cautionGhost" | "ghost" | "inverse",
   onPress: Function
 };
 
 const Button = ({ text, children, nature, ...rest }: Props) => {
-  const textType = nature === "cautionGhost" ? "accent" : "inverse";
+  const textType =
+    nature === "cautionGhost"
+      ? "accent"
+      : nature === "inverse"
+      ? "primary"
+      : "inverse";
   return (
     <StyledButton nature={nature} {...rest}>
       {children ? (

ios/badgerMobile/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -3,55 +3,55 @@
     {
       "size": "20x20",
       "idiom": "iphone",
-      "filename": "Icon-40.png",
+      "filename": "icon_20pt@2x.png",
       "scale": "2x"
     },
     {
       "size": "20x20",
       "idiom": "iphone",
-      "filename": "Icon-60.png",
+      "filename": "icon_20pt@3x.png",
       "scale": "3x"
     },
     {
       "size": "29x29",
       "idiom": "iphone",
-      "filename": "Icon-58.png",
+      "filename": "icon_29pt@2x.png",
       "scale": "2x"
     },
     {
       "size": "29x29",
       "idiom": "iphone",
-      "filename": "Icon-87.png",
+      "filename": "icon_29pt@3x.png",
       "scale": "3x"
     },
     {
       "size": "40x40",
       "idiom": "iphone",
-      "filename": "Icon-80.png",
+      "filename": "icon_40pt@2x.png",
       "scale": "2x"
     },
     {
       "size": "40x40",
       "idiom": "iphone",
-      "filename": "Icon-121.png",
+      "filename": "icon_40pt@3x.png",
       "scale": "3x"
     },
     {
       "size": "60x60",
       "idiom": "iphone",
-      "filename": "Icon-120.png",
+      "filename": "icon_60pt@2x.png",
       "scale": "2x"
     },
     {
       "size": "60x60",
       "idiom": "iphone",
-      "filename": "Icon-180.png",
+      "filename": "icon_60pt@3x.png",
       "scale": "3x"
     },
     {
       "size": "1024x1024",
       "idiom": "ios-marketing",
-      "filename": "icon-1024.png",
+      "filename": "Icon.png",
       "scale": "1x"
     }
   ],

ios/badgerMobile/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.1</string>
+	<string>0.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "badgerMobile",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "license": "MIT",
   "homepage": "https://badger.bitcoin.com",
   "repository": {
@@ -23,13 +23,13 @@
   "dependencies": {
     "@react-native-community/async-storage": "^1.4.1",
     "bignumber.js": "^8.1.1",
-    "bitbox-sdk": "^8.3.2",
+    "bitbox-sdk": "^8.4.0",
     "ethereum-blockies-base64": "^1.0.2",
     "events": "^1.1.1",
     "lodash": "^4.17.11",
     "moment": "^2.24.0",
     "react": "16.8.6",
-    "react-native": "0.59.8",
+    "react-native": "0.59.9",
     "react-native-camera": "^2.6.0",
     "react-native-crypto": "^2.1.2",
     "react-native-gesture-handler": "^1.1.0",
@@ -41,16 +41,16 @@
     "react-native-swipeable": "^0.6.0",
     "react-native-vector-icons": "^6.4.2",
     "react-navigation": "^3.11.0",
-    "react-redux": "^7.0.3",
+    "react-redux": "^7.1.0",
     "readable-stream": "^1.0.33",
     "redux": "^4.0.1",
     "redux-persist": "^5.10.0",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "slp-sdk": "~4.4.0",
-    "slpjs": "^0.18.0",
+    "slpjs": "0.18.0",
     "stream-browserify": "^1.0.0",
-    "styled-components": "^4.2.0",
+    "styled-components": "^4.3.1",
     "url": "^0.11.0",
     "uuid": "^3.3.2",
     "vm-browserify": "0.0.4"
@@ -59,12 +59,12 @@
     "babel-jest": "24.7.1",
     "eslint": "^5.16.0",
     "eslint-config-universe": "^1.0.7",
-    "flow-bin": "^0.97.0",
-    "husky": "^2.3.0",
+    "flow-bin": "^0.101.0",
+    "husky": "^2.4.1",
     "jest": "24.7.1",
     "metro-react-native-babel-preset": "0.53.1",
-    "prettier": "^1.17.1",
-    "pretty-quick": "^1.11.0",
+    "prettier": "^1.18.2",
+    "pretty-quick": "^1.11.1",
     "react-test-renderer": "16.8.6",
     "rn-nodeify": "^10.0.1"
   },

screens/ContactUsScreen.js

@@ -23,7 +23,7 @@ const ContactUsScreen = (props: Props) => {
     <SafeAreaView style={{ height: "100%" }}>
       <ScreenWrapper contentContainerStyle={{ flexGrow: 1 }}>
         <Spacer />
-        <T center>We hope you are enjoying Badger Mobile</T>
+        <T center>We hope you are enjoying Badger Wallet</T>
         <Spacer small />
         <T center>
           If you wish to give feedback, ask a question, or contact us for
@@ -37,7 +37,7 @@ const ContactUsScreen = (props: Props) => {
         <Spacer tiny />
         <TouchableOpacity
           onPress={() =>
-            Linking.openURL("mailto:[email protected]?subject=Badger Mobile")
+            Linking.openURL("mailto:[email protected]?subject=Badger Wallet")
           }
         >
           <T center size="large">

screens/ReceiveScreen.js

@@ -115,7 +115,7 @@ const ReceiveScreen = ({ address, addressSlp }: Props) => {
           )}
         </TouchableOpacity>
         <Spacer tiny />
-        <T center size="small" type="accent">
+        <T center size="small" type="primary">
           {copyNotify === "BCH" ? "Copied BCH Address" : " "}
         </T>
         <Spacer />
@@ -157,7 +157,7 @@ const ReceiveScreen = ({ address, addressSlp }: Props) => {
           )}
         </TouchableOpacity>
         <Spacer tiny />
-        <T center size="small" type="accent">
+        <T center size="small" type="primary">
           {copyNotify === "SLP" ? "Copied SLP Address" : " "}
         </T>
         <Spacer />