Merge pull request #548 from dashpay/release/6.3.3

chore: Release 6.3.3

DashSyncCurrentCommit

@@ -1 +1 @@
-f3624bc8887a5661f6a9b8ad214afdaca77fd674
+66aed38275fe8e5f8ee2e05cfa1414777952c94f

DashWallet.xcodeproj/xcshareddata/xcschemes/DashWalletScreenshotsUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

DashWallet.xcodeproj/xcshareddata/xcschemes/TodayExtension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -93,6 +93,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

DashWallet.xcodeproj/xcshareddata/xcschemes/WatchApp Extension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DashWallet.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DashWallet.xcodeproj/xcshareddata/xcschemes/dashwallet.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

DashWallet/AppDelegate.m

@@ -122,8 +122,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         [self performNormalStartWithLaunchOptions:launchOptions wasDeferred:NO];
     }
 
-    [[Taxes shared] initialize];
-
     NSParameterAssert(self.window.rootViewController);
 
     [self.window makeKeyAndVisible];

DashWallet/Resources/AppAssets.xcassets/Shortcuts/shortcut_buySellDash.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shortcut bar.png",
+      "filename" : "Buy & Sell.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar-3.png",
+      "filename" : "Buy & Sell 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Shortcut bar@2x.png",
+      "filename" : "Buy & Sell@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@2x-3.png",
+      "filename" : "Buy & Sell@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shortcut bar@3x.png",
+      "filename" : "Buy & Sell@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@3x-3.png",
+      "filename" : "Buy & Sell@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/Shortcuts/shortcut_explore.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shortcut bar.png",
+      "filename" : "Explore 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar-1.png",
+      "filename" : "Explore.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Shortcut bar@2x.png",
+      "filename" : "Explore@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@2x-1.png",
+      "filename" : "Explore@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shortcut bar@3x.png",
+      "filename" : "Explore@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@3x-1.png",
+      "filename" : "Explore@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/Shortcuts/shortcut_payToAddress.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shortcut bar.png",
+      "filename" : "Send 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar 1.png",
+      "filename" : "Send.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Shortcut bar@2x.png",
+      "filename" : "Send@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@2x 1.png",
+      "filename" : "Send@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shortcut bar@3x.png",
+      "filename" : "Send@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@3x 1.png",
+      "filename" : "Send@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/Shortcuts/shortcut_receive.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shortcut bar.png",
+      "filename" : "Receive 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar-2.png",
+      "filename" : "Receive.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Shortcut bar@2x.png",
+      "filename" : "Receive@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@2x-2.png",
+      "filename" : "Receive@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shortcut bar@3x.png",
+      "filename" : "Receive@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@3x-2.png",
+      "filename" : "Receive@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/Shortcuts/shortcut_scanToPay.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shortcut bar.png",
+      "filename" : "Scan QR.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar 1.png",
+      "filename" : "Scan QR 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Shortcut bar@2x.png",
+      "filename" : "Scan QR@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@2x 1.png",
+      "filename" : "Scan QR@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shortcut bar@3x.png",
+      "filename" : "Scan QR@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@3x 1.png",
+      "filename" : "Scan QR@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/Shortcuts/shortcut_secureWalletNow.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shortcut bar.png",
+      "filename" : "Backup.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar 1.png",
+      "filename" : "Backup 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Shortcut bar@2x.png",
+      "filename" : "Backup@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@2x 1.png",
+      "filename" : "Backup@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shortcut bar@3x.png",
+      "filename" : "Backup@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Shortcut bar@3x 1.png",
+      "filename" : "Backup@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/backup-icon.imageset/Contents.json

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