Merge branch 'master' into opspack

ios/BlueWallet.xcodeproj/project.pbxproj

@@ -1727,11 +1727,12 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 310;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A7W54YZ4WU;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Stickers/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MARKETING_VERSION = 6.0.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -1757,11 +1758,12 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 310;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A7W54YZ4WU;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Stickers/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MARKETING_VERSION = 6.0.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers;

ios/Stickers/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json

@@ -1,91 +1,91 @@
 {
-  "images" : [
-    {
-      "filename" : "icon-29x29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "icon-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "icon-60x45@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x45"
-    },
-    {
-      "filename" : "icon-60x45@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x45"
-    },
-    {
-      "filename" : "icon-29x29~ipad@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "icon-67x50~ipad@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "67x50"
-    },
-    {
-      "filename" : "icon-74x55~ipad@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "74x55"
-    },
-    {
-      "filename" : "marketing-1024x1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "icon-27x20@2x.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "scale" : "2x",
-      "size" : "27x20"
-    },
-    {
-      "filename" : "icon-27x20@3x.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "scale" : "3x",
-      "size" : "27x20"
-    },
-    {
-      "filename" : "icon-32x24@2x.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "scale" : "2x",
-      "size" : "32x24"
-    },
-    {
-      "filename" : "icon-32x24@3x.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "scale" : "3x",
-      "size" : "32x24"
-    },
-    {
-      "filename" : "marketing-1024x768.png",
-      "idiom" : "ios-marketing",
-      "platform" : "ios",
-      "scale" : "1x",
-      "size" : "1024x768"
-    }
-  ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "images" : [
+    {
+      "size" : "29x29",
+      "scale" : "2x",
+      "idiom" : "iphone",
+      "filename" : "icon-29x29@2x.png"
+    },
+    {
+      "scale" : "3x",
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "filename" : "icon-29x29@3x.png"
+    },
+    {
+      "filename" : "icon-60x45@2x.png",
+      "scale" : "2x",
+      "idiom" : "iphone",
+      "size" : "60x45"
+    },
+    {
+      "scale" : "3x",
+      "idiom" : "iphone",
+      "filename" : "icon-60x45@3x.png",
+      "size" : "60x45"
+    },
+    {
+      "scale" : "2x",
+      "idiom" : "ipad",
+      "filename" : "icon-29x29~ipad@2x.png",
+      "size" : "29x29"
+    },
+    {
+      "size" : "67x50",
+      "scale" : "2x",
+      "filename" : "icon-67x50~ipad@2x.png",
+      "idiom" : "ipad"
+    },
+    {
+      "size" : "74x55",
+      "idiom" : "ipad",
+      "filename" : "icon-74x55~ipad@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "filename" : "marketing-1024x1024.png",
+      "scale" : "1x",
+      "idiom" : "ios-marketing"
+    },
+    {
+      "filename" : "icon-27x20@2x.png",
+      "platform" : "ios",
+      "size" : "27x20",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "scale" : "3x",
+      "size" : "27x20",
+      "platform" : "ios",
+      "filename" : "icon-27x20@3x.png",
+      "idiom" : "universal"
+    },
+    {
+      "size" : "32x24",
+      "idiom" : "universal",
+      "filename" : "icon-32x24@2x.png",
+      "platform" : "ios",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon-32x24@3x.png",
+      "scale" : "3x",
+      "size" : "32x24",
+      "platform" : "ios"
+    },
+    {
+      "scale" : "1x",
+      "filename" : "marketing-1024x768.png",
+      "platform" : "ios",
+      "size" : "1024x768",
+      "idiom" : "ios-marketing"
     }
+  ]
 }

tests/e2e/bluewallet.spec.js

@@ -548,6 +548,14 @@ describe('BlueWallet UI Tests', () => {
       newInstance: true,
       url: 'bitcoin:BC1QH6TF004TY7Z7UN2V5NTU4MKF630545GVHS45U7\\?amount=0.0001\\&label=Yo',
     });
+
+    // setting fee rate:
+    const feeRate = 2;
+    await element(by.id('chooseFee')).tap();
+    await element(by.id('feeCustom')).tap();
+    await element(by.type('android.widget.EditText')).typeText(feeRate + '');
+    await element(by.text('OK')).tap();
+
     try {
       await element(by.id('CreateTransactionButton')).tap();
     } catch (_) {}