Merge pull request #696 from Syn-McJ/feat/dashspend-login

feat(dashspend): authentication & merchant types info

Author: Syn-McJ

DashWallet.xcodeproj/project.pbxproj

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

DashWallet/Resources/AppAssets.xcassets/Explore Dash/ctx.logo.imageset/Contents.json

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

DashWallet/Resources/AppAssets.xcassets/Explore Dash/ctx.logo.imageset/logo.ctx.png

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