Skip to content

Commit 8e31a01

Browse files
authored
Merge pull request #772 from dashpay/feat/maya-conversion-order-preview
feat(wallet): implement Maya sell convert and order preview flow
2 parents 4a02fe3 + fc905ee commit 8e31a01

623 files changed

Lines changed: 17122 additions & 4044 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

DashSyncCurrentCommit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e272a368fa8b5a3fcaa637f5631352980dcc557f
1+
13fc5bea98a6c0f1b80c4e2c146ff5bf536baf76

DashWallet.xcodeproj/project.pbxproj

Lines changed: 1022 additions & 468 deletions
Large diffs are not rendered by default.

DashWallet.xcodeproj/xcshareddata/xcschemes/dashwallet.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</Testables>
7474
</TestAction>
7575
<LaunchAction
76-
buildConfiguration = "Testflight"
76+
buildConfiguration = "Debug"
7777
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7878
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7979
language = "en"

DashWallet/AppDelegate.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ - (void)registerForPushNotifications {
8181
#pragma mark - UIApplicationDelegate
8282

8383
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions {
84+
#if DEBUG
85+
if ([NSProcessInfo.processInfo.environment[@"XCODE_RUNNING_FOR_PREVIEWS"] isEqualToString:@"1"]) {
86+
return YES;
87+
}
88+
#endif /* DEBUG */
89+
8490
#if FRESH_INSTALL
8591
[[NSUserDefaults standardUserDefaults] removePersistentDomainForName:[[NSBundle mainBundle] bundleIdentifier]];
8692
NSArray *secItemClasses = @[(__bridge id)kSecClassGenericPassword,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "dash-logo-black.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "dash-logo-black@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "dash-logo-black@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
3.93 KB
8.06 KB
12.6 KB
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

0 commit comments

Comments
 (0)