chore(dashpay): restoring Contacts flow

DashPay/Presentation/Home/DWDashPayReadyProtocol.h

@@ -24,7 +24,6 @@ extern NSNotificationName const DWDashPayAvailabilityStatusUpdatedNotification;
 @protocol DWDashPayReadyProtocol <NSObject>
 
 @property (readonly, nonatomic, assign) BOOL isDashPayReady;
-@property (readonly, nonatomic, assign) BOOL isDashPayReadyMainSuggestion;
 
 @end
 

DashWallet/Resources/AppAssets.xcassets/TabBar/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/tabbar_pay_button.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_contacts_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "tabbar_pay_button.png",
+      "filename" : "contacts.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_pay_button@2x.png",
+      "filename" : "contacts@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_pay_button@3x.png",
+      "filename" : "contacts@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/tabbar_discover_icon.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_contacts_selected.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "tabbar_discover_icon.png",
+      "filename" : "contacts_selected.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_discover_icon@2x.png",
+      "filename" : "contacts_selected@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_discover_icon@3x.png",
+      "filename" : "contacts_selected@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/tabbar_contacts_icon.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_discover_icon.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "explore.png",
       "idiom" : "universal",
-      "filename" : "tabbar_contacts_icon.png",
       "scale" : "1x"
     },
     {
+      "filename" : "explore@2x.png",
       "idiom" : "universal",
-      "filename" : "tabbar_contacts_icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "explore@3x.png",
       "idiom" : "universal",
-      "filename" : "tabbar_contacts_icon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_discover_selected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "explore_selected.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "explore_selected@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "explore_selected@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/tabbar_home_icon.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_home_icon.imageset/Contents.json

@@ -1,26 +1,26 @@
 {
   "images" : [
     {
+      "filename" : "home.png",
       "idiom" : "universal",
-      "filename" : "tabbar_home_icon.png",
       "scale" : "1x"
     },
     {
+      "filename" : "home@2x.png",
       "idiom" : "universal",
-      "filename" : "tabbar_home_icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "home@3x.png",
       "idiom" : "universal",
-      "filename" : "tabbar_home_icon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}

DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_home_selected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "home_selected.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_selected@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_selected@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/tabbar_other_icon.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_other_icon.imageset/Contents.json

@@ -1,26 +1,26 @@
 {
   "images" : [
     {
+      "filename" : "more.png",
       "idiom" : "universal",
-      "filename" : "tabbar_other_icon.png",
       "scale" : "1x"
     },
     {
+      "filename" : "more@2x.png",
       "idiom" : "universal",
-      "filename" : "tabbar_other_icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "more@3x.png",
       "idiom" : "universal",
-      "filename" : "tabbar_other_icon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}

DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_other_selected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "more_selected.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "more_selected@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "more_selected@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/TabBar/tabbar_pay_button.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "receive.sent.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "receive.sent@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "receive.sent@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Sources/UI/DashPay/Contacts/Base/DWSearchViewController.h

@@ -17,10 +17,10 @@
 
 @import UIKit;
 
-#import "dashwallet-Swift.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol DWNavigationFullscreenable;
+
 @interface DWSearchViewController : UIViewController <DWNavigationFullscreenable, UISearchBarDelegate>
 
 @property (readonly, nonatomic, strong) UISearchBar *searchBar;

DashWallet/Sources/UI/DashPay/Contacts/DWContactsViewController.m

@@ -50,11 +50,11 @@ - (void)viewDidLoad {
 
     switch (self.intent) {
         case DWContactsControllerIntent_Default:
-            self.title = NSLocalizedString(@"Contacts", nil);
+            self.navigationItem.title = NSLocalizedString(@"Contacts", nil);
             break;
 
         case DWContactsControllerIntent_PayToSelector:
-            self.title = NSLocalizedString(@"Send to a Contact", nil);
+            self.navigationItem.title = NSLocalizedString(@"Send to a Contact", nil);
             break;
     }
 

DashWallet/Sources/UI/DashPay/Contacts/DWRootContactsViewController.m

@@ -52,7 +52,7 @@ - (instancetype)initWithPayModel:(id<DWPayModelProtocol>)payModel
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.title = NSLocalizedString(@"Contacts", nil);
+    self.navigationItem.title = NSLocalizedString(@"Contacts", nil);
 
     self.view.backgroundColor = [UIColor dw_secondaryBackgroundColor];
 

DashWallet/Sources/UI/DashPay/Contacts/GlobalSearch/Model/DWUserSearchModel.m

@@ -122,6 +122,10 @@ - (void)willDisplayItemAtIndex:(NSInteger)index {
 }
 
 - (BOOL)canOpenBlockchainIdentity:(DSBlockchainIdentity *)blockchainIdentity {
+    if (MOCK_DASHPAY) {
+        return YES;
+    }
+
     DSWallet *wallet = [DWEnvironment sharedInstance].currentWallet;
     DSBlockchainIdentity *myBlockchainIdentity = wallet.defaultBlockchainIdentity;
     return !uint256_eq(myBlockchainIdentity.uniqueID, blockchainIdentity.uniqueID);
@@ -164,6 +168,23 @@ - (void)performSearchAndNotify:(BOOL)notify {
 }
 
 - (void)performSearchWithQuery:(NSString *)query offset:(uint32_t)offset {
+    if (MOCK_DASHPAY) {
+        NSMutableArray<id<DWDPBasicUserItem, DWDPBlockchainIdentityBackedItem>> *items = [NSMutableArray array];
+
+        for (int i = 0; i < 3; i++) {
+            DSWallet *wallet = [DWEnvironment sharedInstance].currentWallet;
+            NSString *username = [NSString stringWithFormat:@"%@%d", query, i];
+            DSBlockchainIdentity *identity = [wallet createBlockchainIdentityForUsername:username];
+            id<DWDPBasicUserItem, DWDPBlockchainIdentityBackedItem> item = [self.itemsFactory itemForBlockchainIdentity:identity];
+            [items addObject:item];
+        }
+
+        self.searchRequest.hasNextPage = NO;
+        self.searchRequest.items = items;
+
+        [self.delegate userSearchModel:self completedWithItems:items];
+    }
+
     self.searchRequest.requestInProgress = YES;
 
     DSIdentitiesManager *manager = [DWEnvironment sharedInstance].currentChainManager.identitiesManager;

DashWallet/Sources/UI/DashPay/Contacts/Models/DWBaseContactsModel.m

@@ -23,6 +23,7 @@
 #import "DWDashPayContactsActions.h"
 #import "DWDashPayContactsUpdater.h"
 #import "DWEnvironment.h"
+#import "DWDashPayConstants.h"
 
 @implementation DWBaseContactsModel
 
@@ -42,6 +43,10 @@ - (instancetype)init {
 }
 
 - (BOOL)hasBlockchainIdentity {
+    if (MOCK_DASHPAY) {
+        return YES;
+    }
+
     DSWallet *wallet = [DWEnvironment sharedInstance].currentWallet;
     DSBlockchainIdentity *myBlockchainIdentity = wallet.defaultBlockchainIdentity;
     return myBlockchainIdentity != nil;

DashWallet/Sources/UI/DashPay/DWDashPayConstants.h

@@ -23,6 +23,7 @@ extern uint64_t DWDP_MIN_BALANCE_TO_CREATE_USERNAME;
 extern uint64_t DWDP_MIN_BALANCE_TO_CREATE_INVITE;
 extern NSInteger DW_MIN_USERNAME_LENGTH;
 extern NSInteger DW_MAX_USERNAME_LENGTH;
+extern BOOL MOCK_DASHPAY;
 
 extern NSString *const DWDP_THUMBNAIL_SERVER;
 NS_ASSUME_NONNULL_END

DashWallet/Sources/UI/DashPay/DWDashPayConstants.m

@@ -24,5 +24,6 @@
 
 NSInteger DW_MIN_USERNAME_LENGTH = 3;
 NSInteger DW_MAX_USERNAME_LENGTH = 24;
+BOOL MOCK_DASHPAY = YES; // TODO: remove once Platform is available
 
 NSString *const DWDP_THUMBNAIL_SERVER = @"http://54.74.4.114";

DashWallet/Sources/UI/DashPay/Profile/Model/DWUserProfileModel.m

@@ -23,6 +23,7 @@
 #import "DWGlobalOptions.h"
 #import "DWProfileTxsFetchedDataSource.h"
 #import "DWUserProfileDataSourceObject.h"
+#import "DWDashPayConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -155,6 +156,11 @@ - (BOOL)shouldShowAcceptDeclineRequestAction {
 }
 
 - (void)sendContactRequest:(void (^)(BOOL success))completion {
+    if (MOCK_DASHPAY) {
+        completion(YES);
+        return;
+    }
+
     self.sendRequestState = DWUserProfileModelState_Loading;
 
     DSWallet *wallet = [DWEnvironment sharedInstance].currentWallet;

DashWallet/Sources/UI/Explore Dash/DWExploreTestnetViewController.h

@@ -15,12 +15,12 @@
 //  limitations under the License.
 //
 
-#import "dashwallet-Swift.h"
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class DWExploreTestnetViewController;
+@protocol DWNavigationFullscreenable;
 
 @protocol DWExploreTestnetViewControllerDelegate <NSObject>