Merge branch 'master' into settingsui

android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BlueWallet</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/app/build.gradle

@@ -119,7 +119,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "4.7.4"
+        versionName "4.8.0"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }

ios/BlueWallet/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.4</string>
+	<string>4.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/BlueWalletWatch Extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.4</string>
+	<string>4.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>239</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/BlueWalletWatch/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.4</string>
+	<string>4.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>239</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
-  - appcenter (2.5.0):
+  - appcenter (2.6.0):
     - AppCenterReactNativeShared
     - React
-  - appcenter-analytics (2.5.0):
+  - appcenter-analytics (2.6.0):
     - AppCenter/Analytics
     - AppCenterReactNativeShared
     - React
-  - appcenter-crashes (2.5.0):
+  - appcenter-crashes (2.6.0):
     - AppCenter/Crashes
     - AppCenterReactNativeShared
     - React
@@ -343,9 +343,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AppCenter: fddcbac6e4baae3d93a196ceb0bfe0e4ce407dec
-  appcenter: bde9923b687332a25607fc1aa9577c9361cfed85
-  appcenter-analytics: 0ee7a35def715d4bce58ec435f54161770195166
-  appcenter-crashes: 9f9c5647dba19026ff09509576fb7233f69697ff
+  appcenter: dc687dcf81280ccab1dc938b0b974d265144a802
+  appcenter-analytics: fa8dba207d07733dcbda749d262fde3e7161258d
+  appcenter-crashes: fa97ffec69882486d7183193cc9394473757d1ad
   AppCenterReactNativeShared: d5e360f8a4cb5126d29e31ab98051d2f070ba631
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: 8cbc5155c978f2e43098818c91d206d07aae6d30

ios/TodayExtension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.3</string>
+	<string>4.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/fastlane/metadata/en-US/release_notes.txt

@@ -1,3 +1,18 @@
+v4.8.0
+======
+
+* ADD: Today Extension and Quick Actions
+* ADD: Send max option on advanced menu
+* ADD: Add Onchain address view for Lightning
+* FIX: Allow textfield to be visible above keyboard
+* FIX: lapp browser when typing URL without https scheme it doesnt work
+* ADD: Value and memo to the success screen fix logic for both sent and receive
+* FIX: layout for small devices with flexbox
+* FIX: Dont allow zero invoices to enable create invoice button
+* FIX: Change create button on Receive LN payment should be create invoice
+* FIX: Update for watch
+
+
 v4.7.1
 ======
 
@@ -31,10 +46,4 @@ v4.6.0
 * FIX: typo on NL language
 * FIX: better wallet export QR readability
 * FIX: RBF tx memo porting
-* REF: better initial HD rescan
-
-v4.5.2
-======
-
-* FIX: NaN when sending onchain
-* FIX: RBF tx memo porting
+* REF: better initial HD rescan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "BlueWallet",
-  "version": "4.7.4",
+  "version": "4.8.0",
   "devDependencies": {
     "@babel/core": "^7.5.0",
     "@babel/runtime": "^7.5.1",
@@ -54,9 +54,9 @@
     "@remobile/react-native-qrcode-local-image": "git+https://github.com/BlueWallet/react-native-qrcode-local-image.git",
     "@sentry/react-native": "1.0.9",
     "amplitude-js": "5.6.0",
-    "appcenter": "2.5.0",
-    "appcenter-analytics": "2.5.0",
-    "appcenter-crashes": "2.5.0",
+    "appcenter": "2.6.0",
+    "appcenter-analytics": "2.6.0",
+    "appcenter-crashes": "2.6.0",
     "bech32": "1.1.3",
     "bignumber.js": "9.0.0",
     "bip21": "2.0.2",