Skip to content

Commit

Permalink
Merge pull request #612 from Syn-McJ/feature/voting-entrypoint
Browse files Browse the repository at this point in the history 
feat(voting): Username voting entry point
  • Loading branch information
@Syn-McJ
Syn-McJ authored Oct 24, 2023
2 parents 423f6cb + 78bf5e6 commit 8055af2
Show file tree
Hide file tree
Showing 15 changed files with 151 additions and 35 deletions.
1 change: 1 addition & 0 deletions .github/workflows/semantic-pull-request.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ jobs:
dashpay
wallet
coinjoin
voting
44 changes: 26 additions & 18 deletions DashWallet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,8 @@
47F4B6CD29485A8B00AED4C9 /* ConfirmOrderCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F4B6CC29485A8B00AED4C9 /* ConfirmOrderCells.swift */; };
47FA3AFF29350929008D58DC /* SyncingActivityMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47FA3AFE29350929008D58DC /* SyncingActivityMonitor.swift */; };
47FA3B0229364991008D58DC /* HTTPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47FA3B0129364991008D58DC /* HTTPClient.swift */; };
7502A4872AE401EF00ACDDD3 /* UsernameVotingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502A4862AE401EF00ACDDD3 /* UsernameVotingViewController.swift */; };
7502A4892AE4024000ACDDD3 /* UsernameVoting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7502A4882AE4024000ACDDD3 /* UsernameVoting.storyboard */; };
7513DA882AB175E0005D55F6 /* TopperViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7527720E2AA9F58E0066557E /* TopperViewModel.swift */; };
7513DA892AB17606005D55F6 /* Topper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E2F3C92AA4D1B900C3B458 /* Topper.swift */; };
7513DA8A2AB17666005D55F6 /* SupportedTopperAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7527720C2AA9B2630066557E /* SupportedTopperAssets.swift */; };
Expand All @@ -559,12 +561,12 @@
757E09991ADB8EEB006FD352 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 757E09971ADB8EEB006FD352 /* Localizable.strings */; };
75889B762AD296E700C17F5D /* CoinJoinInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75889B752AD296E700C17F5D /* CoinJoinInfoViewController.swift */; };
75889B792AD2A04900C17F5D /* CoinJoinInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75889B752AD296E700C17F5D /* CoinJoinInfoViewController.swift */; };
75889B7A2AD2D78A00C17F5D /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75889B7D2AD2D78A00C17F5D /* CrowdNode.storyboard */; };
75889B7B2AD2D78A00C17F5D /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75889B7D2AD2D78A00C17F5D /* CrowdNode.storyboard */; };
75889B7F2AD2D7F800C17F5D /* CoinJoin.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75889B812AD2D7F800C17F5D /* CoinJoin.storyboard */; };
75889B892AD2DF0200C17F5D /* CoinJoin.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75889B812AD2D7F800C17F5D /* CoinJoin.storyboard */; };
75AE5A7F2A87C363006CD4BA /* DWConfirmUsernameContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C943B5712A40ED4200AF23C5 /* DWConfirmUsernameContentView.xib */; };
75D5F3CE191EC270004AB296 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 75D5F3CD191EC270004AB296 /* main.m */; };
75E093F92AE3DE1300B82E1F /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75E093F82AE3DE1300B82E1F /* CrowdNode.storyboard */; };
75E093FA2AE3DE1300B82E1F /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75E093F82AE3DE1300B82E1F /* CrowdNode.storyboard */; };
75E2F3C82AA4CF1900C3B458 /* Topper-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 75E2F3C72AA4CF1900C3B458 /* Topper-Info.plist */; };
75E2F3CA2AA4D1B900C3B458 /* Topper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E2F3C92AA4D1B900C3B458 /* Topper.swift */; };
75E83CF61B5F997A0038FB70 /* coinflip.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 75E83CF51B5F997A0038FB70 /* coinflip.aiff */; };
Expand Down Expand Up @@ -2373,6 +2375,8 @@
556B5EBEBAEA571D74FF69A3 /* Pods-WatchApp Extension.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WatchApp Extension.testflight.xcconfig"; path = "Pods/Target Support Files/Pods-WatchApp Extension/Pods-WatchApp Extension.testflight.xcconfig"; sourceTree = "<group>"; };
5FD4C91FB8EAB529E8E41227 /* Pods-dashwallet no watch.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dashwallet no watch.testnet.xcconfig"; path = "Pods/Target Support Files/Pods-dashwallet no watch/Pods-dashwallet no watch.testnet.xcconfig"; sourceTree = "<group>"; };
6FBBFC90577C940D8C04E0B1 /* Pods-DashWalletScreenshotsUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashWalletScreenshotsUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DashWalletScreenshotsUITests/Pods-DashWalletScreenshotsUITests.debug.xcconfig"; sourceTree = "<group>"; };
7502A4862AE401EF00ACDDD3 /* UsernameVotingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsernameVotingViewController.swift; sourceTree = "<group>"; };
7502A4882AE4024000ACDDD3 /* UsernameVoting.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = UsernameVoting.storyboard; sourceTree = "<group>"; };
7509C10E1AF3076100D03FD5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
7509C1121AF3720100D03FD5 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
750C6CC01B5C8EB60038AAE9 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand All @@ -2389,7 +2393,6 @@
756A8F131CE566F6007893E2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Interface.strings; sourceTree = "<group>"; };
757E09981ADB8EEB006FD352 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
75889B752AD296E700C17F5D /* CoinJoinInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoinJoinInfoViewController.swift; sourceTree = "<group>"; };
75889B7C2AD2D78A00C17F5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CrowdNode.storyboard; sourceTree = "<group>"; };
75889B802AD2D7F800C17F5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CoinJoin.storyboard; sourceTree = "<group>"; };
759816E519357D6F005060EA /* BRBubbleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRBubbleView.h; sourceTree = "<group>"; };
759816E619357D6F005060EA /* BRBubbleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRBubbleView.m; sourceTree = "<group>"; };
Expand All @@ -2404,6 +2407,7 @@
75DE02491B0EB7C80027FF08 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
75DE024D1B0EB7FC0027FF08 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
75DE02511B0EB8030027FF08 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; lineEnding = 0; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
75E093F82AE3DE1300B82E1F /* CrowdNode.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CrowdNode.storyboard; sourceTree = "<group>"; };
75E2F3C72AA4CF1900C3B458 /* Topper-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Topper-Info.plist"; sourceTree = "<group>"; };
75E2F3C92AA4D1B900C3B458 /* Topper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Topper.swift; sourceTree = "<group>"; };
75E83CF51B5F997A0038FB70 /* coinflip.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = coinflip.aiff; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3347,8 +3351,8 @@
1141E4C3291FDC3B00ACDA9E /* Getting Started */,
1141E4C0291BB0FC00ACDA9E /* Portal */,
11BD737A28E6BCD400A34022 /* New Account */,
75889B7D2AD2D78A00C17F5D /* CrowdNode.storyboard */,
11E47BA728EAE7AD0097CFA0 /* CrowdNodeModel.swift */,
75E093F82AE3DE1300B82E1F /* CrowdNode.storyboard */,
);
path = CrowdNode;
sourceTree = "<group>";
Expand Down Expand Up @@ -3794,6 +3798,7 @@
2A44313C22CF631E009BAF7F /* UI */ = {
isa = PBXGroup;
children = (
7502A4852AE401DA00ACDDD3 /* Voting */,
75889B742AD296D500C17F5D /* CoinJoin */,
C943B34F2A40A54500AF23C5 /* DashPay */,
4751137228DAF27300223B77 /* Assembly */,
Expand Down Expand Up @@ -5945,6 +5950,15 @@
path = Networking;
sourceTree = "<group>";
};
7502A4852AE401DA00ACDDD3 /* Voting */ = {
isa = PBXGroup;
children = (
7502A4862AE401EF00ACDDD3 /* UsernameVotingViewController.swift */,
7502A4882AE4024000ACDDD3 /* UsernameVoting.storyboard */,
);
path = Voting;
sourceTree = "<group>";
};
75889B742AD296D500C17F5D /* CoinJoin */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -7700,11 +7714,11 @@
1193FF3E2962F1BE004EA8D7 /* OperationStatus.storyboard in Resources */,
2A9FFE9C2230FF4700956D5F /* UpholdLogoutTutorialStoryboard.storyboard in Resources */,
2A9FFE8F2230FF4700956D5F /* UpholdAuthStoryboard.storyboard in Resources */,
75889B7A2AD2D78A00C17F5D /* CrowdNode.storyboard in Resources */,
2AFF01E6243F8626003718DC /* DWDPRegistrationDoneTableViewCell.xib in Resources */,
2A10EB412358D2A900C38B61 /* ResetWalletInfo.storyboard in Resources */,
FB66977F212C0B940034BE4F /* LaunchScreen.storyboard in Resources */,
2A8B9E5C22FF6FE500FF8653 /* Pay.storyboard in Resources */,
75E093F92AE3DE1300B82E1F /* CrowdNode.storyboard in Resources */,
2A8C24B6233370A600000D43 /* QuickReceive.storyboard in Resources */,
47A514622848FEAD005A8E3E /* Tx.storyboard in Resources */,
2A8F420921BED16300858B91 /* DashSyncCurrentCommit in Resources */,
Expand Down Expand Up @@ -7776,6 +7790,7 @@
C9D2C9182A320AA000D15901 /* LockScreen.storyboard in Resources */,
C9D2C9192A320AA000D15901 /* UpholdMainStoryboard.storyboard in Resources */,
C9D2C91A2A320AA000D15901 /* Migrations.bundle in Resources */,
75E093FA2AE3DE1300B82E1F /* CrowdNode.storyboard in Resources */,
C9D2C91B2A320AA000D15901 /* TxDetailTaxCategoryCell.xib in Resources */,
C9D2C91C2A320AA000D15901 /* Localizable.stringsdict in Resources */,
C943B4C12A40A54600AF23C5 /* DWTitleActionHeaderView.xib in Resources */,
Expand Down Expand Up @@ -7807,14 +7822,14 @@
C9D2C9362A320AA000D15901 /* UpholdLogoutTutorialStoryboard.storyboard in Resources */,
C943B5542A40C23500AF23C5 /* DWFilterHeaderView.xib in Resources */,
C9D2C9372A320AA000D15901 /* UpholdAuthStoryboard.storyboard in Resources */,
75889B7B2AD2D78A00C17F5D /* CrowdNode.storyboard in Resources */,
C9D2C9392A320AA000D15901 /* DWDPRegistrationDoneTableViewCell.xib in Resources */,
C9D2C93A2A320AA000D15901 /* ResetWalletInfo.storyboard in Resources */,
C9D2C93B2A320AA000D15901 /* LaunchScreen.storyboard in Resources */,
C9D2C93C2A320AA000D15901 /* Pay.storyboard in Resources */,
C9D2C93D2A320AA000D15901 /* QuickReceive.storyboard in Resources */,
C9D2C93E2A320AA000D15901 /* Tx.storyboard in Resources */,
C9D2C93F2A320AA000D15901 /* DashSyncCurrentCommit in Resources */,
7502A4892AE4024000ACDDD3 /* UsernameVoting.storyboard in Resources */,
C9D2C9402A320AA000D15901 /* DWMainMenuTableViewCell.xib in Resources */,
C9D2C9412A320AA000D15901 /* VerifiedSuccessfully.storyboard in Resources */,
C9D2C9422A320AA000D15901 /* Setup.storyboard in Resources */,
Expand Down Expand Up @@ -9356,6 +9371,7 @@
C9D2C8642A320AA000D15901 /* AppliedFiltersView.swift in Sources */,
C9D2C8652A320AA000D15901 /* DWCaptureSessionManager.m in Sources */,
C9D2C8662A320AA000D15901 /* DWDataMigrationManager.m in Sources */,
7502A4872AE401EF00ACDDD3 /* UsernameVotingViewController.swift in Sources */,
C9D2C86A2A320AA000D15901 /* (null) in Sources */,
C943B51F2A40A54600AF23C5 /* DWSuccessInvitationView.m in Sources */,
C9D2C86B2A320AA000D15901 /* AmountPreviewView.swift in Sources */,
Expand Down Expand Up @@ -9598,14 +9614,6 @@
name = Localizable.strings;
sourceTree = "<group>";
};
75889B7D2AD2D78A00C17F5D /* CrowdNode.storyboard */ = {
isa = PBXVariantGroup;
children = (
75889B7C2AD2D78A00C17F5D /* Base */,
);
name = CrowdNode.storyboard;
sourceTree = "<group>";
};
75889B812AD2D7F800C17F5D /* CoinJoin.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down Expand Up @@ -10265,7 +10273,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 148;
CURRENT_PROJECT_VERSION = 150;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
Expand Down Expand Up @@ -10320,7 +10328,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 148;
CURRENT_PROJECT_VERSION = 150;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -10374,7 +10382,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 148;
CURRENT_PROJECT_VERSION = 150;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -10438,7 +10446,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 148;
CURRENT_PROJECT_VERSION = 150;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down
6 changes: 3 additions & 3 deletions DashWallet/Resources/AppAssets.xcassets/Menu/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
23 changes: 23 additions & 0 deletions DashWallet/Resources/AppAssets.xcassets/Menu/menu_voting.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "voting.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added DashWallet/Resources/AppAssets.xcassets/Menu/menu_voting.imageset/voting.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DashWallet/Resources/AppAssets.xcassets/Menu/menu_voting.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DashWallet/Resources/AppAssets.xcassets/Menu/menu_voting.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions DashWallet/Sources/UI/Menu/Main/DWMainMenuViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@ - (void)mainMenuContentView:(DWMainMenuContentView *)view didSelectMenuItem:(id<
[self.navigationController pushViewController:controller animated:YES];
break;
}
case DWMainMenuItemType_Voting: {
UsernameVotingViewController *controller = [UsernameVotingViewController controller];
controller.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:controller animated:YES];
break;
}
#endif
}
}
Expand Down
6 changes: 6 additions & 0 deletions DashWallet/Sources/UI/Menu/Main/Views/Cells/DWMainMenuTableViewCell.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
return [UIImage imageNamed:@"menu_support"];
case DWMainMenuItemType_Invite:
return [UIImage imageNamed:@"menu_invite"];
case DWMainMenuItemType_Voting:
return [UIImage imageNamed:@"menu_voting"];
}
}

Expand All @@ -56,6 +58,8 @@
return NSLocalizedString(@"Support", nil);
case DWMainMenuItemType_Invite:
return NSLocalizedString(@"Invite", nil);
case DWMainMenuItemType_Voting:
return NSLocalizedString(@"Username voting", nil);
}
}

Expand All @@ -75,6 +79,8 @@
return NSLocalizedString(@"Report an Issue", nil);
case DWMainMenuItemType_Invite:
return NSLocalizedString(@"Let your friends and family to join Dash", nil);
case DWMainMenuItemType_Voting:
return NSLocalizedString(@"", nil);
}
}

Expand Down
1 change: 1 addition & 0 deletions DashWallet/Sources/UI/Menu/Main/Views/Model/DWMainMenuItem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ typedef NS_ENUM(NSUInteger, DWMainMenuItemType) {
DWMainMenuItemType_Tools,
DWMainMenuItemType_Support,
DWMainMenuItemType_Invite,
DWMainMenuItemType_Voting
};

@protocol DWMainMenuItem <NSObject>
Expand Down
6 changes: 6 additions & 0 deletions DashWallet/Sources/UI/Menu/Main/Views/Model/DWMainMenuModel.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ + (NSArray *)allItems {
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Security],
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Settings],
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Tools],
#if DASHPAY
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Voting],
#endif
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Support],
];
});
Expand All @@ -88,6 +91,9 @@ + (NSArray *)testnetItems {
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Security],
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Settings],
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Tools],
#if DASHPAY
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Voting],
#endif
[[DWMainMenuItemImpl alloc] initWithType:DWMainMenuItemType_Support],
];
});
Expand Down
2 changes: 1 addition & 1 deletion DashWallet/Sources/UI/Menu/Settings/About/DWAboutModel.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ - (void)setFixedPeer:(NSString *)fixedPeer {
host = @(inet_ntop(AF_INET6, &addr, s, sizeof(s)));
}
[[DWEnvironment sharedInstance].currentChainManager.peerManager setTrustedPeerHost:[NSString stringWithFormat:@"%@:%d", host, port]];
[[DWEnvironment sharedInstance].currentChainManager.peerManager disconnect];
[[DWEnvironment sharedInstance].currentChainManager.peerManager disconnect:DSDisconnectReason_TrustedPeerSet];
[[DWEnvironment sharedInstance].currentChainManager.peerManager connect];
break;
}
Expand Down
Loading

0 comments on commit 8055af2

Please sign in to comment.