diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index 8c186f345..5d36bf622 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/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; diff --git a/ios/Stickers/Info.plist b/ios/Stickers/Info.plist index 9b2f7385e..239f73ed7 100644 --- a/ios/Stickers/Info.plist +++ b/ios/Stickers/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionPointIdentifier diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json index f2752e2d7..56018cabc 100644 --- a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json +++ b/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" + } + ] +} \ No newline at end of file diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@2x.png index e08c25f2a..8253a0245 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@3x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@3x.png index e487e5b81..4fdfc9102 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@3x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-27x20@3x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@2x.png index 2893288e3..50aa739fd 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@3x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@3x.png index 873bcf8e8..773651338 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@3x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29@3x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29~ipad@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29~ipad@2x.png index 2893288e3..50aa739fd 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29~ipad@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-29x29~ipad@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@2x.png index ea43c0812..50765b3b8 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@3x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@3x.png index 38becd407..bcb99730a 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@3x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-32x24@3x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@2x.png index a89065a23..5e69f518d 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@3x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@3x.png index 1a0308298..7649657d9 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@3x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-60x45@3x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-67x50~ipad@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-67x50~ipad@2x.png index 47345af28..10c7faed6 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-67x50~ipad@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-67x50~ipad@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-74x55~ipad@2x.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-74x55~ipad@2x.png index 27a1e1bc7..5650bfde8 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-74x55~ipad@2x.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-74x55~ipad@2x.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x1024.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x1024.png index 482396034..73921486f 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x1024.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x1024.png differ diff --git a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x768.png b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x768.png index 0a356db31..6d4535d06 100644 Binary files a/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x768.png and b/ios/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/marketing-1024x768.png differ diff --git a/tests/e2e/bluewallet.spec.js b/tests/e2e/bluewallet.spec.js index fde63bc84..49cb48ac9 100644 --- a/tests/e2e/bluewallet.spec.js +++ b/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 (_) {}