Merge branch 'release/1.0.15'

MyEtherWallet · Apr 3, 2020 · 28a1e8b · 28a1e8b
2 parents 382d3b3 + 0ea9845
commit 28a1e8b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Release 1.0.15
+- Buy Ether scenario fix
+
 ### Release 1.0.14
 ANNOUNCEMENT: Full-fledged MEW wallet app is now available!
 You can now buy, hold and send Ether and tokens directly in the app, without having to connect to MEW web.

diff --git a/Configurations/application.xcconfig b/Configurations/application.xcconfig
@@ -1,2 +1,2 @@
-APPLICATION_VERSION=1.0.12
-APPLICATION_BUILD=19050102
+APPLICATION_VERSION=1.0.15
+APPLICATION_BUILD=20032501.7
diff --git a/MyEtherWallet-iOS.xcodeproj/project.pbxproj b/MyEtherWallet-iOS.xcodeproj/project.pbxproj
@@ -12096,7 +12096,7 @@
  CODE_SIGN_ENTITLEMENTS = "MyEtherWallet-iOS/MyEtherWallet-iOS.entitlements";
  CODE_SIGN_IDENTITY = "iPhone Developer";
  CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 20031001.5;
+ CURRENT_PROJECT_VERSION = "${APPLICATION_BUILD}";
  DEVELOPMENT_TEAM = MDN888GSU8;
  ENABLE_BITCODE = NO;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -12108,7 +12108,7 @@
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.0.14;
+ MARKETING_VERSION = "${APPLICATION_VERSION}";
  PRODUCT_BUNDLE_IDENTIFIER = com.myetherwallet.mewconnect;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12387,7 +12387,7 @@
  CODE_SIGN_ENTITLEMENTS = "MyEtherWallet-iOS/MyEtherWallet-iOS.entitlements";
  CODE_SIGN_IDENTITY = "iPhone Developer";
  CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 20031001.5;
+ CURRENT_PROJECT_VERSION = "${APPLICATION_BUILD}";
  DEVELOPMENT_TEAM = MDN888GSU8;
  ENABLE_BITCODE = NO;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -12399,7 +12399,7 @@
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.0.14;
+ MARKETING_VERSION = "${APPLICATION_VERSION}";
  PRODUCT_BUNDLE_IDENTIFIER = com.myetherwallet.mewconnect;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12420,7 +12420,7 @@
  CODE_SIGN_ENTITLEMENTS = "MyEtherWallet-iOS/MyEtherWallet-iOS.entitlements";
  CODE_SIGN_IDENTITY = "iPhone Developer";
  CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 20031001.5;
+ CURRENT_PROJECT_VERSION = "${APPLICATION_BUILD}";
  DEVELOPMENT_TEAM = MDN888GSU8;
  ENABLE_BITCODE = NO;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -12432,7 +12432,7 @@
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.0.14;
+ MARKETING_VERSION = "${APPLICATION_VERSION}";
  PRODUCT_BUNDLE_IDENTIFIER = com.myetherwallet.mewconnect;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/...essLogicLayer/Services/ConcreteServices/AnalyticsService/AnalyticsServiceImplementation.m b/...essLogicLayer/Services/ConcreteServices/AnalyticsService/AnalyticsServiceImplementation.m
@@ -53,12 +53,12 @@ - (AnalyticsBody *) _obtainBodyWithEvent:(NSString *)event {
 
  NSISO8601DateFormatter *dateFormatter = [[NSISO8601DateFormatter alloc] init];
  dateFormatter.formatOptions = NSISO8601DateFormatWithFullDate | NSISO8601DateFormatWithFullTime;
- if (@available(iOS 11.0, *)) {
+ if (@available(iOS 11.2, *)) {
  dateFormatter.formatOptions |= NSISO8601DateFormatWithFractionalSeconds;
  }
 
  NSString *timestamp = [dateFormatter stringFromDate:[NSDate date]];
- if (@available(iOS 11.0, *)) {
+ if (@available(iOS 11.2, *)) {
  //do nothing
  } else {
  if ([timestamp length] > 1) {

diff --git a/...ts/RequestConfigurators/ConcreteClasses/RESTRequestConfigurator/RESTRequestConfigurator.m b/...ts/RequestConfigurators/ConcreteClasses/RESTRequestConfigurator/RESTRequestConfigurator.m
@@ -25,7 +25,6 @@ - (instancetype)initWithBaseURL:(NSURL *)baseURL
  if (self) {
  _baseURL = [baseURL copy];
  _apiPath = [apiPath copy];
- self.HTTPMethodsEncodingParametersInURI = [self.HTTPMethodsEncodingParametersInURI setByAddingObject:@"POST"];
  }
  return self;
 }