Merge pull request #103 from Shopify/public/apple-pay-shop-fix

Public/apple pay shop fix

Mobile Buy SDK/Mobile Buy SDK/Models/BUYError.m

@@ -32,7 +32,7 @@ NSString * const BUYShopifyError = @"BUYShopifyError";
 
 - (NSString *)description
 {
-	return [[self userInfo] description];
+	return [NSString stringWithFormat:@"Error code %td: %@", self.code, [self userInfo]];
 }
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m

@@ -331,7 +331,9 @@ const NSTimeInterval PollDelay = 0.5;
 				[NSThread sleepForTimeInterval:PollDelay];
 			}
 		}
-		completion(checkoutStatus == BUYStatusComplete ? PKPaymentAuthorizationStatusSuccess : PKPaymentAuthorizationStatusFailure);
+		dispatch_async(dispatch_get_main_queue(), ^{
+			completion(checkoutStatus == BUYStatusComplete ? PKPaymentAuthorizationStatusSuccess : PKPaymentAuthorizationStatusFailure);
+		});
 	});
 }
 

Mobile Buy SDK/Mobile Buy SDK/View Controllers/BUYViewController.m

@@ -147,7 +147,7 @@ NSString * BUYURLKey = @"url";
 	__block NSError *checkoutError = nil;
 	
 	// download the shop
-	if (self.shop != nil) {
+	if (self.shop == nil) {
 		dispatch_group_enter(group);
 		[self loadShopWithCallback:^(BOOL success, NSError *error) {