Skip to content

Commit 854f6ea

Browse files
Syn-McJSyn-McJ
authored
Merge pull request #709 from Syn-McJ/chore/dashspend-disable-buy
chore(dashspend): disable buy button
2 parents 644884a + bd9e166 commit 854f6ea

95 files changed

Lines changed: 942 additions & 520 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.

‎DashWallet.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,10 @@
508508
7503643B2C89CFB70029EC0D /* CoinJoinProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750364392C89CFB70029EC0D /* CoinJoinProgressView.swift */; };
509509
7503643E2C89D49A0029EC0D /* CoinJoinService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7503643D2C89D49A0029EC0D /* CoinJoinService.swift */; };
510510
7503643F2C89D49A0029EC0D /* CoinJoinService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7503643D2C89D49A0029EC0D /* CoinJoinService.swift */; };
511+
75050CCE2DF2CB0F00F586D6 /* GiftCardMetadataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75050CCD2DF2CB0E00F586D6 /* GiftCardMetadataProvider.swift */; };
512+
75050CCF2DF2CB0F00F586D6 /* GiftCardMetadataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75050CCD2DF2CB0E00F586D6 /* GiftCardMetadataProvider.swift */; };
513+
75050CD12DF2FCC200F586D6 /* ServiceName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75050CD02DF2FCBF00F586D6 /* ServiceName.swift */; };
514+
75050CD22DF2FCC200F586D6 /* ServiceName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75050CD02DF2FCBF00F586D6 /* ServiceName.swift */; };
511515
750CED602C94BFD7000FB837 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750CED5F2C94BFD7000FB837 /* SettingsViewModel.swift */; };
512516
750CED612C94BFD7000FB837 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750CED5F2C94BFD7000FB837 /* SettingsViewModel.swift */; };
513517
750CEFA12CCA6EA100E87A32 /* TextInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750CEFA02CCA6EA100E87A32 /* TextInput.swift */; };
@@ -659,8 +663,6 @@
659663
759609212C4553A400F3BF04 /* BuyCreditsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759609202C4553A400F3BF04 /* BuyCreditsViewController.swift */; };
660664
759609232C455B2000F3BF04 /* SendIntro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759609222C455B2000F3BF04 /* SendIntro.swift */; };
661665
759609242C455B2000F3BF04 /* SendIntro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759609222C455B2000F3BF04 /* SendIntro.swift */; };
662-
759A7EA72CFDA707009423AD /* UIViewController+DWTxFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759A7EA62CFDA6FF009423AD /* UIViewController+DWTxFilter.swift */; };
663-
759A7EA82CFDA707009423AD /* UIViewController+DWTxFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759A7EA62CFDA6FF009423AD /* UIViewController+DWTxFilter.swift */; };
664666
759ADD572BF3447400767ACD /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759ADD562BF3447400767ACD /* Button.swift */; };
665667
759ADD582BF3447400767ACD /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759ADD562BF3447400767ACD /* Button.swift */; };
666668
759AFDE02CC63571007072D2 /* JoinDashPayScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759AFDDF2CC6356D007072D2 /* JoinDashPayScreen.swift */; };
@@ -708,6 +710,8 @@
708710
75D5D5342CC928630049ED7B /* UIHostingController+DashWallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D5D5322CC9285B0049ED7B /* UIHostingController+DashWallet.swift */; };
709711
75D5F3CE191EC270004AB296 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 75D5F3CD191EC270004AB296 /* main.m */; };
710712
75D6561D2B07936100D1A902 /* UsernameRequests.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75D656192B0792F500D1A902 /* UsernameRequests.storyboard */; };
713+
75D657672DF579F300ACE570 /* TransactionFilterDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D657662DF579F300ACE570 /* TransactionFilterDialog.swift */; };
714+
75D657682DF579F300ACE570 /* TransactionFilterDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D657662DF579F300ACE570 /* TransactionFilterDialog.swift */; };
711715
75D66D332B05E7AE00A8DDA6 /* QuickVoteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D66D322B05E7AE00A8DDA6 /* QuickVoteViewController.swift */; };
712716
75D6D8E42D96A6DB00E40A6D /* StubTransactionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D6D8E32D96A6D500E40A6D /* StubTransactionSource.swift */; };
713717
75D6D8E52D96A6DB00E40A6D /* StubTransactionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D6D8E32D96A6D500E40A6D /* StubTransactionSource.swift */; };
@@ -2440,6 +2444,8 @@
24402444
7502A4862AE401EF00ACDDD3 /* UsernameVotingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsernameVotingViewController.swift; sourceTree = "<group>"; };
24412445
750364392C89CFB70029EC0D /* CoinJoinProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoinJoinProgressView.swift; sourceTree = "<group>"; };
24422446
7503643D2C89D49A0029EC0D /* CoinJoinService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoinJoinService.swift; sourceTree = "<group>"; };
2447+
75050CCD2DF2CB0E00F586D6 /* GiftCardMetadataProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiftCardMetadataProvider.swift; sourceTree = "<group>"; };
2448+
75050CD02DF2FCBF00F586D6 /* ServiceName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceName.swift; sourceTree = "<group>"; };
24432449
7509C10E1AF3076100D03FD5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
24442450
7509C1121AF3720100D03FD5 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
24452451
750C6CC01B5C8EB60038AAE9 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -2542,7 +2548,6 @@
25422548
759609222C455B2000F3BF04 /* SendIntro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendIntro.swift; sourceTree = "<group>"; };
25432549
759816E519357D6F005060EA /* BRBubbleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRBubbleView.h; sourceTree = "<group>"; };
25442550
759816E619357D6F005060EA /* BRBubbleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRBubbleView.m; sourceTree = "<group>"; };
2545-
759A7EA62CFDA6FF009423AD /* UIViewController+DWTxFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+DWTxFilter.swift"; sourceTree = "<group>"; };
25462551
759ADD562BF3447400767ACD /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
25472552
759AFDDF2CC6356D007072D2 /* JoinDashPayScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinDashPayScreen.swift; sourceTree = "<group>"; };
25482553
759AFDE22CC67E89007072D2 /* VotingInfoScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VotingInfoScreen.swift; sourceTree = "<group>"; };
@@ -2577,6 +2582,7 @@
25772582
75D5F3CF191EC270004AB296 /* DashWallet-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DashWallet-Prefix.pch"; sourceTree = "<group>"; };
25782583
75D5F3E5191EC270004AB296 /* DashWalletTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DashWalletTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
25792584
75D656192B0792F500D1A902 /* UsernameRequests.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = UsernameRequests.storyboard; sourceTree = "<group>"; };
2585+
75D657662DF579F300ACE570 /* TransactionFilterDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionFilterDialog.swift; sourceTree = "<group>"; };
25802586
75D66D322B05E7AE00A8DDA6 /* QuickVoteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickVoteViewController.swift; sourceTree = "<group>"; };
25812587
75D6D8E32D96A6D500E40A6D /* StubTransactionSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StubTransactionSource.swift; sourceTree = "<group>"; };
25822588
75D9EBB72DE5CC3A009416A2 /* AddGiftCardsTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGiftCardsTable.swift; sourceTree = "<group>"; };
@@ -3813,6 +3819,7 @@
38133819
C9F452002A0CE6C900825057 /* HomeView.swift */,
38143820
754BEA112C0B6BD700E8C93C /* HomeViewModel.swift */,
38153821
751C05DC2D3E39A600475E52 /* TransactionListDataItem.swift */,
3822+
75D657662DF579F300ACE570 /* TransactionFilterDialog.swift */,
38163823
);
38173824
path = Views;
38183825
sourceTree = "<group>";
@@ -4625,12 +4632,11 @@
46254632
2A9CEBB622E1FA0000A50237 /* Home */ = {
46264633
isa = PBXGroup;
46274634
children = (
4628-
7549BE552DEAECA5004F0BAF /* Custom Icons */,
4635+
7549BE552DEAECA5004F0BAF /* Tx Metadata */,
46294636
2A1A60B92674083B003DAC65 /* Syncing Views */,
46304637
2A913E7223A2EAEF006A2A59 /* Protocols */,
46314638
2A2CD6E522F46D1A008C7BC9 /* Models */,
46324639
2A307CB322E6FA7F00A18347 /* Views */,
4633-
759A7EA62CFDA6FF009423AD /* UIViewController+DWTxFilter.swift */,
46344640
75FFD6B72BF47BA20032879E /* HomeViewController.swift */,
46354641
75FFD6BA2BF48DF80032879E /* HomeViewController+JailbreakCheck.swift */,
46364642
75FFD6BD2BF491FC0032879E /* HomeViewController+BackupReminder.swift */,
@@ -5193,6 +5199,7 @@
51935199
4709C316287EA22600B4BD48 /* DAO */,
51945200
4709C314287EA11900B4BD48 /* TransactionMetadata.swift */,
51955201
7549BE592DEAF50D004F0BAF /* IconBitmap.swift */,
5202+
75050CD02DF2FCBF00F586D6 /* ServiceName.swift */,
51965203
);
51975204
path = "Tx Metadata";
51985205
sourceTree = "<group>";
@@ -6116,12 +6123,13 @@
61166123
path = DashSpend;
61176124
sourceTree = "<group>";
61186125
};
6119-
7549BE552DEAECA5004F0BAF /* Custom Icons */ = {
6126+
7549BE552DEAECA5004F0BAF /* Tx Metadata */ = {
61206127
isa = PBXGroup;
61216128
children = (
6129+
75050CCD2DF2CB0E00F586D6 /* GiftCardMetadataProvider.swift */,
61226130
7549BE562DEAECB0004F0BAF /* CustomIconMetadataProvider.swift */,
61236131
);
6124-
path = "Custom Icons";
6132+
path = "Tx Metadata";
61256133
sourceTree = "<group>";
61266134
};
61276135
754C27C62CC3C0B900BA7B9F /* Usernames */ = {
@@ -8603,7 +8611,6 @@
86038611
110C679A29227948006B580C /* UINavigationController+CrowdNode.swift in Sources */,
86048612
2A8B9E7A2302E67400FF8653 /* DWReceiveModel.m in Sources */,
86058613
119E8D0A2905413F00D406C1 /* TransactionWrapper.swift in Sources */,
8606-
759A7EA82CFDA707009423AD /* UIViewController+DWTxFilter.swift in Sources */,
86078614
479DBDDD2995168C00F30AF1 /* Transactions.swift in Sources */,
86088615
75F3F00D2C48F819004470EA /* RootEditProfileViewController.swift in Sources */,
86098616
2A74EFFB2305464C00C475EB /* DWRecoverTextView.m in Sources */,
@@ -8789,6 +8796,7 @@
87898796
C956AF2D2A5CEA1F002FAB75 /* SheetViewController.swift in Sources */,
87908797
C9C1335A2A561FFA00B66651 /* PasteboardContentView.swift in Sources */,
87918798
2A7A7BD02348A34800451078 /* DWSecurityMenuModel.m in Sources */,
8799+
75050CCF2DF2CB0F00F586D6 /* GiftCardMetadataProvider.swift in Sources */,
87928800
C909615929F29C9200002D82 /* KeysOverviewCell.swift in Sources */,
87938801
2ACCD86E2319609400A96B62 /* UIViewController+DWShareReceiveInfo.m in Sources */,
87948802
114D16B829828BCC009A124C /* OnlineAccountConfirmationController.swift in Sources */,
@@ -8902,6 +8910,7 @@
89028910
47AF18082907B7880025803E /* BaseAmountModel.swift in Sources */,
89038911
4709C312287E78BD00B4BD48 /* SeedDB.swift in Sources */,
89048912
2ACCD8F0231ECDE000A96B62 /* DWPinField.m in Sources */,
8913+
75050CD22DF2FCC200F586D6 /* ServiceName.swift in Sources */,
89058914
2AD1CEA222DFC80900C99324 /* DWCenteredScrollView.m in Sources */,
89068915
7549BE5D2DEAF55B004F0BAF /* IconBitmapDAO.swift in Sources */,
89078916
2A9172C425233DC50024B4C5 /* DWPhraseRepairViewController.m in Sources */,
@@ -9075,6 +9084,7 @@
90759084
47838B7A2900196F0003E8AB /* ConverterView.swift in Sources */,
90769085
2A0C69CA23142E11001B8C90 /* DWModalBaseAnimation.m in Sources */,
90779086
C956AF262A5CACE6002FAB75 /* TitleValueCell.swift in Sources */,
9087+
75D657682DF579F300ACE570 /* TransactionFilterDialog.swift in Sources */,
90789088
75EBAA0C2BB9792F004488E3 /* FeatureTopText.swift in Sources */,
90799089
C9F42FB829DFC507001BC549 /* SpendableTransaction.swift in Sources */,
90809090
11ED906B29681773003784F9 /* StakingInfoDialogController.swift in Sources */,
@@ -9288,6 +9298,7 @@
92889298
C943B58B2A40ED6F00AF23C5 /* DWInputUsernameViewController.m in Sources */,
92899299
C9D2C6E62A320AA000D15901 /* CrowdNodeEndpoint.swift in Sources */,
92909300
C9D2C6E72A320AA000D15901 /* ServiceEntryPointModel.swift in Sources */,
9301+
75050CD12DF2FCC200F586D6 /* ServiceName.swift in Sources */,
92919302
C943B4B72A40A54600AF23C5 /* DWBaseContactsModel.m in Sources */,
92929303
C9D2C6E82A320AA000D15901 /* ExploreDash.swift in Sources */,
92939304
C9D2C6EB2A320AA000D15901 /* UpholdAmountModel.swift in Sources */,
@@ -9336,7 +9347,6 @@
93369347
C9D2C7072A320AA000D15901 /* AmountInputTypeSwitcher.swift in Sources */,
93379348
C943B4FA2A40A54600AF23C5 /* DWDPOutgoingRequestNotificationObject.m in Sources */,
93389349
75EBAA132BB99B6B004488E3 /* BottomSheet.swift in Sources */,
9339-
759A7EA72CFDA707009423AD /* UIViewController+DWTxFilter.swift in Sources */,
93409350
C9D2C7082A320AA000D15901 /* DWPlaceholderFormCellModel.m in Sources */,
93419351
C9D2C7092A320AA000D15901 /* DWOverlapControl.m in Sources */,
93429352
C9D2C70A2A320AA000D15901 /* CoinsToAddressTxFilter.swift in Sources */,
@@ -9410,6 +9420,7 @@
94109420
757514E52B1735370026AD8E /* JoinDashPayView.swift in Sources */,
94119421
C9D2C73C2A320AA000D15901 /* DWDecimalInputValidator.m in Sources */,
94129422
C9D2C73D2A320AA000D15901 /* PaymentMethods.swift in Sources */,
9423+
75D657672DF579F300ACE570 /* TransactionFilterDialog.swift in Sources */,
94139424
C9D2C73E2A320AA000D15901 /* DWTitleDetailCellModel.m in Sources */,
94149425
7514E4EA2AF2351F00A0466F /* VotingFiltersModel.swift in Sources */,
94159426
C943B4E22A40A54600AF23C5 /* DWPassthroughView.m in Sources */,
@@ -9468,6 +9479,7 @@
94689479
C9D2C7602A320AA000D15901 /* DWAppGroupOptions.m in Sources */,
94699480
C943B5352A40A54600AF23C5 /* DWNotificationsViewController.m in Sources */,
94709481
C9D2C7612A320AA000D15901 /* DWTransactionListDataItemObject.m in Sources */,
9482+
75050CCE2DF2CB0F00F586D6 /* GiftCardMetadataProvider.swift in Sources */,
94719483
C943B3362A408CED00AF23C5 /* DWEditProfileBaseCell.m in Sources */,
94729484
C930784A2A6AD52400906E4B /* UpholdConfirmTransferModel.swift in Sources */,
94739485
C9D2C7622A320AA000D15901 /* DWUpholdAPIProvider.m in Sources */,

DashWallet/Resources/AppAssets.xcassets/icon_selector.imageset/Contents.json renamed to DashWallet/Resources/AppAssets.xcassets/Explore Dash/image.dashspend.giftcard.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"images" : [
33
{
4-
"filename" : "icon_dropDown.png",
4+
"filename" : "GiftCard.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "icon_dropDown@2x.png",
9+
"filename" : "GiftCard@2x.png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "icon_dropDown@3x.png",
14+
"filename" : "GiftCard@3x.png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}

‎DashWallet/Resources/AppAssets.xcassets/Explore Dash/image.dashspend.giftcard.imageset/GiftCard.png‎

678 Bytes
Loading

‎DashWallet/Resources/AppAssets.xcassets/Explore Dash/image.dashspend.giftcard.imageset/GiftCard@2x.png‎

1.21 KB
Loading

‎DashWallet/Resources/AppAssets.xcassets/Explore Dash/image.dashspend.giftcard.imageset/GiftCard@3x.png‎

1.65 KB
Loading

‎DashWallet/Resources/AppAssets.xcassets/icon_pay_small.imageset/icon_pay_small.png‎

-247 Bytes
Binary file not shown.

‎DashWallet/Resources/AppAssets.xcassets/icon_pay_small.imageset/icon_pay_small@2x.png‎

-384 Bytes
Binary file not shown.

‎DashWallet/Resources/AppAssets.xcassets/icon_pay_small.imageset/icon_pay_small@3x.png‎

-576 Bytes
Binary file not shown.

‎DashWallet/Resources/AppAssets.xcassets/icon_receive_small.imageset/Contents.json‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎DashWallet/Resources/AppAssets.xcassets/icon_receive_small.imageset/icon_receive_small.png‎

-278 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)