From 640e5383e23261df07879bf4fd301ec0f229fc91 Mon Sep 17 00:00:00 2001 From: Maksym Rachytskyy Date: Tue, 23 Jul 2024 10:42:43 +0300 Subject: [PATCH] [Legacy - FileBased] Remove Shielded Transactions Support (#400) ## Purpose Remove Shielded Transactions Support ## Changes - Removed related to the shielded transfers logic. Removed TransferType cases related the shielded transfers - Add shielded transactions sunset pop up --- ConcordiumWallet.xcodeproj/project.pbxproj | 152 ++-------- .../Model/Database/TransferEntity.swift | 10 +- ConcordiumWallet/Model/TransferType.swift | 3 - .../icons/ico_unshield.imageset/Contents.json | 23 ++ .../ico_unshield.imageset/ico_unshield.png | Bin 0 -> 2329 bytes .../ico_unshield.imageset/ico_unshield@2x.png | Bin 0 -> 4544 bytes .../ico_unshield.imageset/ico_unshield@3x.png | Bin 0 -> 6853 bytes .../images/shielding_1.svg | 34 --- .../images/shielding_2.svg | 47 --- .../images/unshielding_1.svg | 30 -- .../shielded_balance_onboarding_en_1.html | 21 -- .../shielded_balance_onboarding_en_2.html | 26 -- .../shielded_balance_onboarding_en_3.html | 22 -- .../shielded_balance_onboarding_en_4.html | 23 -- .../shielded_balance_onboarding_en_5.html | 15 - .../shielded_balance_onboarding_en_6.html | 22 -- .../shielded_balance_onboarding_en_7.html | 23 -- .../styles/shielded_balance_style.css | 10 - ConcordiumWallet/Service/MobileWallet.swift | 12 - .../Storyboards/Base.lproj/Account.storyboard | 269 ++++++++---------- .../AccountDetailsCoordinator.swift | 88 +----- .../AccountDetailsPresenter.swift | 30 -- .../AccountDetailsViewController.swift | 23 +- .../TransactionViewModel.swift | 14 +- .../TransactionSubmittedPresenter.swift | 8 +- .../AccountsView/AccountsCoordinator.swift | 28 ++ .../AccountsView/AccountsViewController.swift | 4 +- .../GettingStartedViewController.swift | 4 +- .../SendFundConfirmationPresenter.swift | 12 +- .../SendFund/SendFundPresenter.swift | 38 +-- .../SendFunds/SendFundsCoordinator.swift | 9 - .../Service/TransactionsService.swift | 6 - .../Identities/IdentitiesCoordinator.swift | 6 +- .../UnshiedSunset/UnshiedSunsetView.swift | 89 ++++++ Podfile.lock | 2 +- 35 files changed, 299 insertions(+), 804 deletions(-) create mode 100644 ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/Contents.json create mode 100644 ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield.png create mode 100644 ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@2x.png create mode 100644 ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@3x.png delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_1.svg delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_2.svg delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/unshielding_1.svg delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_1.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_2.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_3.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_4.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_5.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_6.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_7.html delete mode 100644 ConcordiumWallet/Resources/SchieldedBalanceOnboarding/styles/shielded_balance_style.css create mode 100644 ConcordiumWallet/Views/UnshiedSunset/UnshiedSunsetView.swift diff --git a/ConcordiumWallet.xcodeproj/project.pbxproj b/ConcordiumWallet.xcodeproj/project.pbxproj index b29a31ff..3ba2762e 100644 --- a/ConcordiumWallet.xcodeproj/project.pbxproj +++ b/ConcordiumWallet.xcodeproj/project.pbxproj @@ -45,50 +45,6 @@ 070D61E027B2A3C600B6903C /* OnboardingCarouselPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070D61DE27B2A25200B6903C /* OnboardingCarouselPageViewController.swift */; }; 070D61E127B2A3C700B6903C /* OnboardingCarouselPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070D61DE27B2A25200B6903C /* OnboardingCarouselPageViewController.swift */; }; 070D61E227B2A3C700B6903C /* OnboardingCarouselPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070D61DE27B2A25200B6903C /* OnboardingCarouselPageViewController.swift */; }; - 070D620527B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61F827B3C54500B6903C /* shielded_balance_onboarding_en_1.html */; }; - 070D620627B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61F827B3C54500B6903C /* shielded_balance_onboarding_en_1.html */; }; - 070D620727B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61F827B3C54500B6903C /* shielded_balance_onboarding_en_1.html */; }; - 070D620827B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61F827B3C54500B6903C /* shielded_balance_onboarding_en_1.html */; }; - 070D621527B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FD27B3C54500B6903C /* shielded_balance_onboarding_en_6.html */; }; - 070D621627B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FD27B3C54500B6903C /* shielded_balance_onboarding_en_6.html */; }; - 070D621727B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FD27B3C54500B6903C /* shielded_balance_onboarding_en_6.html */; }; - 070D621827B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FD27B3C54500B6903C /* shielded_balance_onboarding_en_6.html */; }; - 070D621927B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FE27B3C54500B6903C /* shielded_balance_onboarding_en_7.html */; }; - 070D621A27B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FE27B3C54500B6903C /* shielded_balance_onboarding_en_7.html */; }; - 070D621B27B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FE27B3C54500B6903C /* shielded_balance_onboarding_en_7.html */; }; - 070D621C27B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D61FE27B3C54500B6903C /* shielded_balance_onboarding_en_7.html */; }; - 070D622127B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620127B3C54500B6903C /* shielded_balance_onboarding_en_4.html */; }; - 070D622227B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620127B3C54500B6903C /* shielded_balance_onboarding_en_4.html */; }; - 070D622327B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620127B3C54500B6903C /* shielded_balance_onboarding_en_4.html */; }; - 070D622427B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620127B3C54500B6903C /* shielded_balance_onboarding_en_4.html */; }; - 070D622527B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620227B3C54500B6903C /* shielded_balance_onboarding_en_5.html */; }; - 070D622627B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620227B3C54500B6903C /* shielded_balance_onboarding_en_5.html */; }; - 070D622727B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620227B3C54500B6903C /* shielded_balance_onboarding_en_5.html */; }; - 070D622827B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620227B3C54500B6903C /* shielded_balance_onboarding_en_5.html */; }; - 070D622927B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620327B3C54500B6903C /* shielded_balance_onboarding_en_2.html */; }; - 070D622A27B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620327B3C54500B6903C /* shielded_balance_onboarding_en_2.html */; }; - 070D622B27B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620327B3C54500B6903C /* shielded_balance_onboarding_en_2.html */; }; - 070D622C27B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620327B3C54500B6903C /* shielded_balance_onboarding_en_2.html */; }; - 070D622D27B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620427B3C54500B6903C /* shielded_balance_onboarding_en_3.html */; }; - 070D622E27B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620427B3C54500B6903C /* shielded_balance_onboarding_en_3.html */; }; - 070D622F27B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620427B3C54500B6903C /* shielded_balance_onboarding_en_3.html */; }; - 070D623027B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */ = {isa = PBXBuildFile; fileRef = 070D620427B3C54500B6903C /* shielded_balance_onboarding_en_3.html */; }; - 070D624827B3D67100B6903C /* shielded_balance_style.css in Resources */ = {isa = PBXBuildFile; fileRef = 070D624727B3D67100B6903C /* shielded_balance_style.css */; }; - 070D624927B3D67100B6903C /* shielded_balance_style.css in Resources */ = {isa = PBXBuildFile; fileRef = 070D624727B3D67100B6903C /* shielded_balance_style.css */; }; - 070D624A27B3D67100B6903C /* shielded_balance_style.css in Resources */ = {isa = PBXBuildFile; fileRef = 070D624727B3D67100B6903C /* shielded_balance_style.css */; }; - 070D624B27B3D67100B6903C /* shielded_balance_style.css in Resources */ = {isa = PBXBuildFile; fileRef = 070D624727B3D67100B6903C /* shielded_balance_style.css */; }; - 070D625027B3DD5600B6903C /* unshielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624D27B3DD5600B6903C /* unshielding_1.svg */; }; - 070D625127B3DD5600B6903C /* unshielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624D27B3DD5600B6903C /* unshielding_1.svg */; }; - 070D625227B3DD5600B6903C /* unshielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624D27B3DD5600B6903C /* unshielding_1.svg */; }; - 070D625327B3DD5600B6903C /* unshielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624D27B3DD5600B6903C /* unshielding_1.svg */; }; - 070D625427B3DD5600B6903C /* shielding_2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624E27B3DD5600B6903C /* shielding_2.svg */; }; - 070D625527B3DD5600B6903C /* shielding_2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624E27B3DD5600B6903C /* shielding_2.svg */; }; - 070D625627B3DD5600B6903C /* shielding_2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624E27B3DD5600B6903C /* shielding_2.svg */; }; - 070D625727B3DD5600B6903C /* shielding_2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624E27B3DD5600B6903C /* shielding_2.svg */; }; - 070D625827B3DD5600B6903C /* shielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624F27B3DD5600B6903C /* shielding_1.svg */; }; - 070D625927B3DD5600B6903C /* shielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624F27B3DD5600B6903C /* shielding_1.svg */; }; - 070D625A27B3DD5600B6903C /* shielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624F27B3DD5600B6903C /* shielding_1.svg */; }; - 070D625B27B3DD5600B6903C /* shielding_1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 070D624F27B3DD5600B6903C /* shielding_1.svg */; }; 070D625D27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070D625C27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift */; }; 070D625E27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070D625C27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift */; }; 070D625F27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070D625C27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift */; }; @@ -447,6 +403,10 @@ 218F32A22705DBB800372BBD /* IdentityCreation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 218F329E2705DBB800372BBD /* IdentityCreation.swift */; }; 26AF1825E3D4CB2E54801EFB /* Pods_ConcordiumWalletTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FB9312525E69B21A038A443 /* Pods_ConcordiumWalletTests.framework */; }; 4286EFE82EF437678337ADAE /* Pods_StagingNet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AE842A09677EA6A6A253039 /* Pods_StagingNet.framework */; }; + 509749CA2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C92C2EE25100D28D6B /* UnshiedSunsetView.swift */; }; + 509749CB2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C92C2EE25100D28D6B /* UnshiedSunsetView.swift */; }; + 509749CC2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C92C2EE25100D28D6B /* UnshiedSunsetView.swift */; }; + 509749CD2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C92C2EE25100D28D6B /* UnshiedSunsetView.swift */; }; 52055F772552B83D0071F7CA /* IdentityCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52055F762552B83D0071F7CA /* IdentityCardView.xib */; }; 52055F782552B83D0071F7CA /* IdentityCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52055F762552B83D0071F7CA /* IdentityCardView.xib */; }; 52055F792552B83D0071F7CA /* IdentityCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52055F762552B83D0071F7CA /* IdentityCardView.xib */; }; @@ -2030,17 +1990,6 @@ 070D61D427B2906400B6903C /* OnboardingCarouselPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCarouselPresenter.swift; sourceTree = ""; }; 070D61D627B2907000B6903C /* OnboardingCarouselViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCarouselViewController.swift; sourceTree = ""; }; 070D61DE27B2A25200B6903C /* OnboardingCarouselPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCarouselPageViewController.swift; sourceTree = ""; }; - 070D61F827B3C54500B6903C /* shielded_balance_onboarding_en_1.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_1.html; sourceTree = ""; }; - 070D61FD27B3C54500B6903C /* shielded_balance_onboarding_en_6.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_6.html; sourceTree = ""; }; - 070D61FE27B3C54500B6903C /* shielded_balance_onboarding_en_7.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_7.html; sourceTree = ""; }; - 070D620127B3C54500B6903C /* shielded_balance_onboarding_en_4.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_4.html; sourceTree = ""; }; - 070D620227B3C54500B6903C /* shielded_balance_onboarding_en_5.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_5.html; sourceTree = ""; }; - 070D620327B3C54500B6903C /* shielded_balance_onboarding_en_2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_2.html; sourceTree = ""; }; - 070D620427B3C54500B6903C /* shielded_balance_onboarding_en_3.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = shielded_balance_onboarding_en_3.html; sourceTree = ""; }; - 070D624727B3D67100B6903C /* shielded_balance_style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shielded_balance_style.css; sourceTree = ""; }; - 070D624D27B3DD5600B6903C /* unshielding_1.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unshielding_1.svg; sourceTree = ""; }; - 070D624E27B3DD5600B6903C /* shielding_2.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shielding_2.svg; sourceTree = ""; }; - 070D624F27B3DD5600B6903C /* shielding_1.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shielding_1.svg; sourceTree = ""; }; 070D625C27B3DF0500B6903C /* OnboardingCarouselWebContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCarouselWebContentViewController.swift; sourceTree = ""; }; 070D626B27B40C2D00B6903C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Onboarding.storyboard; sourceTree = ""; }; 074917CE273C02900087225F /* AccountSubmissionStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSubmissionStatus.swift; sourceTree = ""; }; @@ -2191,6 +2140,7 @@ 218F329E2705DBB800372BBD /* IdentityCreation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityCreation.swift; sourceTree = ""; }; 2A3F0FD4F6C2FD3BB235ACE7 /* Pods-ConcordiumWalletTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConcordiumWalletTests.release.xcconfig"; path = "Target Support Files/Pods-ConcordiumWalletTests/Pods-ConcordiumWalletTests.release.xcconfig"; sourceTree = ""; }; 34AFB5995102DCAB454EE528 /* Pods-StagingNet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StagingNet.release.xcconfig"; path = "Target Support Files/Pods-StagingNet/Pods-StagingNet.release.xcconfig"; sourceTree = ""; }; + 509749C92C2EE25100D28D6B /* UnshiedSunsetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnshiedSunsetView.swift; sourceTree = ""; }; 52055F762552B83D0071F7CA /* IdentityCardView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IdentityCardView.xib; sourceTree = ""; }; 52055F802552B8F10071F7CA /* IdentityCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityCardView.swift; sourceTree = ""; }; 52055F852552C1D90071F7CA /* NibLoadable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NibLoadable.swift; sourceTree = ""; }; @@ -2705,7 +2655,6 @@ 901F7F6227F1D5A100C46741 /* RegisterDelegationOnboarding */, 9024FB5827E09B830057EA91 /* RobotoMono.ttf */, 07E6E26E27B558A30083A852 /* IntroductionFlowOnboarding */, - 070D61F727B3C54500B6903C /* SchieldedBalanceOnboarding */, 17A41E4E266790220079BD3A /* Entitlements */, 7FD435FC249A2D34002D2AC3 /* icon-22-29.png */, 7FD435FD249A2D34002D2AC3 /* icon-44-58.png */, @@ -2778,40 +2727,6 @@ path = Onboarding; sourceTree = ""; }; - 070D61F727B3C54500B6903C /* SchieldedBalanceOnboarding */ = { - isa = PBXGroup; - children = ( - 070D624C27B3DD5600B6903C /* images */, - 070D624627B3D67100B6903C /* styles */, - 070D61F827B3C54500B6903C /* shielded_balance_onboarding_en_1.html */, - 070D620327B3C54500B6903C /* shielded_balance_onboarding_en_2.html */, - 070D620427B3C54500B6903C /* shielded_balance_onboarding_en_3.html */, - 070D620127B3C54500B6903C /* shielded_balance_onboarding_en_4.html */, - 070D620227B3C54500B6903C /* shielded_balance_onboarding_en_5.html */, - 070D61FD27B3C54500B6903C /* shielded_balance_onboarding_en_6.html */, - 070D61FE27B3C54500B6903C /* shielded_balance_onboarding_en_7.html */, - ); - path = SchieldedBalanceOnboarding; - sourceTree = ""; - }; - 070D624627B3D67100B6903C /* styles */ = { - isa = PBXGroup; - children = ( - 070D624727B3D67100B6903C /* shielded_balance_style.css */, - ); - path = styles; - sourceTree = ""; - }; - 070D624C27B3DD5600B6903C /* images */ = { - isa = PBXGroup; - children = ( - 070D624D27B3DD5600B6903C /* unshielding_1.svg */, - 070D624E27B3DD5600B6903C /* shielding_2.svg */, - 070D624F27B3DD5600B6903C /* shielding_1.svg */, - ); - path = images; - sourceTree = ""; - }; 070D626127B4081F00B6903C /* OnboardingCarousel */ = { isa = PBXGroup; children = ( @@ -3141,6 +3056,14 @@ path = Network; sourceTree = ""; }; + 509749C82C2ECE3100D28D6B /* UnshiedSunset */ = { + isa = PBXGroup; + children = ( + 509749C92C2EE25100D28D6B /* UnshiedSunsetView.swift */, + ); + path = UnshiedSunset; + sourceTree = ""; + }; 5243C030278E2360005CAC8D /* VerifyIdsAndAccounts */ = { isa = PBXGroup; children = ( @@ -3686,6 +3609,7 @@ 7FF07AE323EAE09B00F1FC04 /* Views */ = { isa = PBXGroup; children = ( + 509749C82C2ECE3100D28D6B /* UnshiedSunset */, 52A0A0B927D0B376001C162D /* Stake */, 7FF07AE523EAE0AC00F1FC04 /* AccountsView */, C93EFF3024107F09002D6DB7 /* Cells */, @@ -4300,13 +4224,11 @@ C92C64F6244EE5AF00675ECE /* 2.5.2.RX_backend_transferCost.json in Resources */, 901F7F7827F1D5DE00C46741 /* delegation_intro_flow_en_6.html in Resources */, 901F7F8027F1D5DE00C46741 /* delegation_intro_flow_en_7.html in Resources */, - 070D622527B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */, 7F48C203244DCD0B00997684 /* LaunchScreen.storyboard in Resources */, 7F48C24F244DCD7100997684 /* 2.4.2.RX_backend_submissionStatus.json in Resources */, 9024FB5927E09B830057EA91 /* RobotoMono.ttf in Resources */, 7FA0AED3246061AD00B7673F /* 3.4.2.RX_backend_submissionStatus_fin_reject.json in Resources */, 9078543128101BFC00B655EB /* baker_update_flow_en_3.html in Resources */, - 070D624827B3D67100B6903C /* shielded_balance_style.css in Resources */, 7F48C206244DCD0B00997684 /* Widget.storyboard in Resources */, 7F48C24A244DCD7100997684 /* 2.1.2.RX-backend_global.json in Resources */, 901F7F8827F1D5DE00C46741 /* delegation_intro_flow_en_5.html in Resources */, @@ -4326,17 +4248,13 @@ 7FD435FE249A2D34002D2AC3 /* icon-22-29.png in Resources */, 7F48C24D244DCD7100997684 /* 3.4.2.RX_backend_submissionStatus.json in Resources */, 9078543528101BFC00B655EB /* baker_update_flow_en_4.html in Resources */, - 070D622927B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */, 07E6E27E27B558A30083A852 /* intro_flow_onboarding_en_3.html in Resources */, - 070D625827B3DD5600B6903C /* shielding_1.svg in Resources */, 070D626727B40C2D00B6903C /* Onboarding.storyboard in Resources */, 7F48C23E244DCD5F00997684 /* 1.1.2.RX-backend_identity_provider_info.json in Resources */, - 070D622127B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */, 8992BA532828E6C5005279C9 /* 5.4.2.RX_backend_passiveDelegation.json in Resources */, 07E6E27627B558A30083A852 /* intro_flow_onboarding_en_5.html in Resources */, 7F48C24B244DCD7100997684 /* 3.2.1.TX-lib_create_transfer.json in Resources */, 52A0A0C527D0B4E8001C162D /* Stake.storyboard in Resources */, - 070D621927B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */, 52055F9A25541B160071F7CA /* AccountCardView.xib in Resources */, 90434C7E27FB111B00E4DBAA /* delegation_update_flow_en_3.html in Resources */, 7F48C20A244DCD0B00997684 /* .swiftlint.yml in Resources */, @@ -4344,10 +4262,8 @@ 7F48C24E244DCD7100997684 /* 2.3.1.TX_backend_submitCredential.json in Resources */, 9078543928101BFC00B655EB /* baker_update_flow_en_5.html in Resources */, 901F7F7C27F1D5DE00C46741 /* delegation_intro_flow_en_3.html in Resources */, - 070D625027B3DD5600B6903C /* unshielding_1.svg in Resources */, 5237186F25751F2100B2BC31 /* 4.5.1.TX_lib_generate_accounts.json in Resources */, 89EB9F5727FEE495005F8633 /* 5.3.2.RX_generate_baker_keys.json in Resources */, - 070D622D27B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */, 7F5F778D24891EA00016F8D1 /* Assets.xcassets in Resources */, 07E6E27A27B558A30083A852 /* intro_flow_onboarding_en_4.html in Resources */, 90434C9227FB2CDA00E4DBAA /* registerdelegation_flow_style.css in Resources */, @@ -4361,9 +4277,7 @@ 7F48C241244DCD7100997684 /* 3.3.2.RX_backend_submitTransfer.json in Resources */, 7F48C245244DCD7100997684 /* 1.2.1.TX-lib_create_id_request_and_private_data.json in Resources */, 07E6E28227B558A30083A852 /* intro_flow_onboarding_en_2.html in Resources */, - 070D625427B3DD5600B6903C /* shielding_2.svg in Resources */, 7FF9190D250E4EAD00B1032B /* ImportStatusCell.xib in Resources */, - 070D621527B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */, 7FA0AED2246061AD00B7673F /* 3.4.2.RX_backend_submissionStatus_com.json in Resources */, 90434C9E27FB2D2800E4DBAA /* updatedelegation_flow_style.css in Resources */, 9078544128101BFC00B655EB /* bakerupdate_flow_style.css in Resources */, @@ -4382,7 +4296,6 @@ 7F48C242244DCD7100997684 /* 1.3.1.TX-backend_request_identity.json in Resources */, 7FA0AED7246061AD00B7673F /* 4.2.2.RX_backend_accTransactions.json in Resources */, 07E6E28A27B558A30083A852 /* intro_flow_style.css in Resources */, - 070D620527B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */, 9078544D28101BFC00B655EB /* baker_intro_flow_en_2.html in Resources */, 19C2EFFF5510E28CD0A195C9 /* 4.1.2.RX_backend_accBalance.json in Resources */, 7FA0AED6246061AD00B7673F /* backend_server_error.json in Resources */, @@ -4405,14 +4318,10 @@ 90434C8027FB111B00E4DBAA /* delegation_update_flow_en_3.html in Resources */, 7F85B7BE246A9A7C00ED09B8 /* LaunchScreen.storyboard in Resources */, 5237186D25751F2100B2BC31 /* 4.5.2.RX_lib_generate_accounts.json in Resources */, - 070D622327B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */, - 070D625227B3DD5600B6903C /* unshielding_1.svg in Resources */, 7F85B7BF246A9A7C00ED09B8 /* More.storyboard in Resources */, 9078543B28101BFC00B655EB /* baker_update_flow_en_5.html in Resources */, 90434CAB27FB2D4200E4DBAA /* removedelegation_flow_style.css in Resources */, 52D3510F250A6AE500858AC6 /* 4.3.2.RX_backend_accEncryptionKey.json in Resources */, - 070D621727B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */, - 070D622F27B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */, 901F7F8227F1D5DE00C46741 /* delegation_intro_flow_en_7.html in Resources */, 5237187125751F2100B2BC31 /* 4.5.1.TX_lib_generate_accounts.json in Resources */, 90434CA027FB2D2800E4DBAA /* updatedelegation_flow_style.css in Resources */, @@ -4422,7 +4331,6 @@ 7FF9190F250E4EAD00B1032B /* ImportStatusCell.xib in Resources */, 90434C6C27FB108D00E4DBAA /* delegation_remove_flow_en_1.html in Resources */, 901F7F7A27F1D5DE00C46741 /* delegation_intro_flow_en_6.html in Resources */, - 070D621B27B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */, 7F85B7C2246A9A7C00ED09B8 /* Widget.storyboard in Resources */, 07E6E28427B558A30083A852 /* intro_flow_onboarding_en_2.html in Resources */, 7FD43604249A2D34002D2AC3 /* icon-44-58.png in Resources */, @@ -4430,8 +4338,6 @@ 901F7F8A27F1D5DE00C46741 /* delegation_intro_flow_en_5.html in Resources */, 901F7F7227F1D5DE00C46741 /* delegation_intro_flow_en_1.html in Resources */, 9078545E28102BD000B655EB /* bakerremove_flow_style.css in Resources */, - 070D625627B3DD5600B6903C /* shielding_2.svg in Resources */, - 070D622B27B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */, 901F7F8627F1D5DE00C46741 /* delegation_intro_flow_en_4.html in Resources */, 9078543F28101BFC00B655EB /* baker_update_flow_en_2.html in Resources */, 901F7F2C27EA138300C46741 /* 5.1.2.RX_backend_baker_pool.json in Resources */, @@ -4455,12 +4361,9 @@ 7F85B7C7246A9A7C00ED09B8 /* Login.storyboard in Resources */, 7F5F778E24891EA80016F8D1 /* Assets.xcassets in Resources */, 9078545328101BFC00B655EB /* baker_intro_flow_en_3.html in Resources */, - 070D625A27B3DD5600B6903C /* shielding_1.svg in Resources */, 90434C7C27FB111B00E4DBAA /* delegation_update_flow_en_2.html in Resources */, 90434C7027FB108D00E4DBAA /* delegation_remove_flow_en_2.html in Resources */, - 070D624A27B3D67100B6903C /* shielded_balance_style.css in Resources */, 901F7F7E27F1D5DE00C46741 /* delegation_intro_flow_en_3.html in Resources */, - 070D620727B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */, 9078543328101BFC00B655EB /* baker_update_flow_en_3.html in Resources */, 07E6E27827B558A30083A852 /* intro_flow_onboarding_en_5.html in Resources */, 07E6E28027B558A30083A852 /* intro_flow_onboarding_en_3.html in Resources */, @@ -4470,7 +4373,6 @@ 9078542F28101BFC00B655EB /* baker_update_flow_en_1.html in Resources */, 9078543728101BFC00B655EB /* baker_update_flow_en_4.html in Resources */, 52055F9C25541B160071F7CA /* AccountCardView.xib in Resources */, - 070D622727B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4486,15 +4388,11 @@ 9078544428101BFC00B655EB /* bakerupdate_flow_style.css in Resources */, 07E6E28527B558A30083A852 /* intro_flow_onboarding_en_2.html in Resources */, 7FF91910250E4EAD00B1032B /* ImportStatusCell.xib in Resources */, - 070D625B27B3DD5600B6903C /* shielding_1.svg in Resources */, - 070D624B27B3D67100B6903C /* shielded_balance_style.css in Resources */, 07E6E28927B558A30083A852 /* intro_flow_onboarding_en_1.html in Resources */, 90434C8527FB111B00E4DBAA /* delegation_update_flow_en_1.html in Resources */, 7F168A042481232400DE429E /* SendFund.storyboard in Resources */, - 070D623027B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */, 90434C8127FB111B00E4DBAA /* delegation_update_flow_en_3.html in Resources */, 9078545428101BFC00B655EB /* baker_intro_flow_en_3.html in Resources */, - 070D621C27B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */, 90434C9527FB2CDA00E4DBAA /* registerdelegation_flow_style.css in Resources */, 90434C6D27FB108D00E4DBAA /* delegation_remove_flow_en_1.html in Resources */, 9078544028101BFC00B655EB /* baker_update_flow_en_2.html in Resources */, @@ -4512,18 +4410,12 @@ 90434C7127FB108D00E4DBAA /* delegation_remove_flow_en_2.html in Resources */, 070D626A27B40C2D00B6903C /* Onboarding.storyboard in Resources */, 9078543828101BFC00B655EB /* baker_update_flow_en_4.html in Resources */, - 070D622427B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */, 901F7F2927EA138300C46741 /* 5.2.2.RX_backend_chain_parameters.json in Resources */, - 070D622C27B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */, - 070D625727B3DD5600B6903C /* shielding_2.svg in Resources */, 9078545028101BFC00B655EB /* baker_intro_flow_en_2.html in Resources */, 9078545F28102BD000B655EB /* bakerremove_flow_style.css in Resources */, 90434CAC27FB2D4200E4DBAA /* removedelegation_flow_style.css in Resources */, 9078544C28101BFC00B655EB /* baker_intro_flow_en_1.html in Resources */, - 070D621827B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */, - 070D622827B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */, 7FD43601249A2D34002D2AC3 /* icon-22-29.png in Resources */, - 070D625327B3DD5600B6903C /* unshielding_1.svg in Resources */, 90434CA127FB2D2800E4DBAA /* updatedelegation_flow_style.css in Resources */, 9078543428101BFC00B655EB /* baker_update_flow_en_3.html in Resources */, 901F7F2D27EA138300C46741 /* 5.1.2.RX_backend_baker_pool.json in Resources */, @@ -4543,7 +4435,6 @@ 9024FB5C27E09B830057EA91 /* RobotoMono.ttf in Resources */, 5237186E25751F2100B2BC31 /* 4.5.2.RX_lib_generate_accounts.json in Resources */, 7F5F778B24891E9F0016F8D1 /* Assets.xcassets in Resources */, - 070D620827B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */, 901F7F7B27F1D5DE00C46741 /* delegation_intro_flow_en_6.html in Resources */, 901F7F7327F1D5DE00C46741 /* delegation_intro_flow_en_1.html in Resources */, ); @@ -4553,12 +4444,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 070D625927B3DD5600B6903C /* shielding_1.svg in Resources */, - 070D621627B3C54600B6903C /* shielded_balance_onboarding_en_6.html in Resources */, 07E6E28B27B558A30083A852 /* intro_flow_style.css in Resources */, 7FF07A7923EADB1400F1FC04 /* LaunchScreen.storyboard in Resources */, 9078543A28101BFC00B655EB /* baker_update_flow_en_5.html in Resources */, - 070D620627B3C54500B6903C /* shielded_balance_onboarding_en_1.html in Resources */, 901F7F8127F1D5DE00C46741 /* delegation_intro_flow_en_7.html in Resources */, 90434C7B27FB111B00E4DBAA /* delegation_update_flow_en_2.html in Resources */, 90434C7F27FB111B00E4DBAA /* delegation_update_flow_en_3.html in Resources */, @@ -4566,11 +4454,8 @@ 7FEEF6FB24532475007C25F2 /* More.storyboard in Resources */, 070D626827B40C2D00B6903C /* Onboarding.storyboard in Resources */, 06A5129823F545DA008050B4 /* Widget.storyboard in Resources */, - 070D624927B3D67100B6903C /* shielded_balance_style.css in Resources */, 901F7F7927F1D5DE00C46741 /* delegation_intro_flow_en_6.html in Resources */, - 070D625127B3DD5600B6903C /* unshielding_1.svg in Resources */, 9024FB5A27E09B830057EA91 /* RobotoMono.ttf in Resources */, - 070D622627B3C54600B6903C /* shielded_balance_onboarding_en_5.html in Resources */, 9078545928102BD000B655EB /* baker_remove_flow_en_1.html in Resources */, 07E6E27F27B558A30083A852 /* intro_flow_onboarding_en_3.html in Resources */, 7FF9190E250E4EAD00B1032B /* ImportStatusCell.xib in Resources */, @@ -4579,13 +4464,10 @@ 52055F782552B83D0071F7CA /* IdentityCardView.xib in Resources */, 9078542E28101BFC00B655EB /* baker_update_flow_en_1.html in Resources */, 9078544E28101BFC00B655EB /* baker_intro_flow_en_2.html in Resources */, - 070D622A27B3C54600B6903C /* shielded_balance_onboarding_en_2.html in Resources */, - 070D621A27B3C54600B6903C /* shielded_balance_onboarding_en_7.html in Resources */, 7FD435FF249A2D34002D2AC3 /* icon-22-29.png in Resources */, 9078544A28101BFC00B655EB /* baker_intro_flow_en_1.html in Resources */, 9078544228101BFC00B655EB /* bakerupdate_flow_style.css in Resources */, 90434C9F27FB2D2800E4DBAA /* updatedelegation_flow_style.css in Resources */, - 070D622E27B3C54600B6903C /* shielded_balance_onboarding_en_3.html in Resources */, 07E6E27B27B558A30083A852 /* intro_flow_onboarding_en_4.html in Resources */, 90434C6B27FB108D00E4DBAA /* delegation_remove_flow_en_1.html in Resources */, 901F7F2727EA138300C46741 /* 5.2.2.RX_backend_chain_parameters.json in Resources */, @@ -4599,7 +4481,6 @@ 07E6E28327B558A30083A852 /* intro_flow_onboarding_en_2.html in Resources */, 901F7F8527F1D5DE00C46741 /* delegation_intro_flow_en_4.html in Resources */, 7FF07A7423EADB1200F1FC04 /* Account.storyboard in Resources */, - 070D622227B3C54600B6903C /* shielded_balance_onboarding_en_4.html in Resources */, 90434C9327FB2CDA00E4DBAA /* registerdelegation_flow_style.css in Resources */, 90434C8327FB111B00E4DBAA /* delegation_update_flow_en_1.html in Resources */, 52A0A0C627D0B4E8001C162D /* Stake.storyboard in Resources */, @@ -4610,7 +4491,6 @@ 9078545D28102BD000B655EB /* bakerremove_flow_style.css in Resources */, 06A5129623F545CD008050B4 /* Identity.storyboard in Resources */, 19C2E2845C662830D186E79E /* .swiftlint.yml in Resources */, - 070D625527B3DD5600B6903C /* shielding_2.svg in Resources */, 901F7F2B27EA138300C46741 /* 5.1.2.RX_backend_baker_pool.json in Resources */, 89EB9F5827FEE495005F8633 /* 5.3.2.RX_generate_baker_keys.json in Resources */, 901F7F7527F1D5DE00C46741 /* delegation_intro_flow_en_2.html in Resources */, @@ -5074,6 +4954,7 @@ 7F48C1A5244DCD0B00997684 /* CreateAccountButtonWidgetPresenter.swift in Sources */, 901F7FA627F33C8800C46741 /* EuroPerEnergy.swift in Sources */, 642A293125FB967A0073BF8C /* ValueCredential.swift in Sources */, + 509749CA2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */, 7F48C1A7244DCD0B00997684 /* Storyboarded.swift in Sources */, 077FD7DC269EC49200EE749C /* SupportMailProtocol.swift in Sources */, 901F7F4327EB4D0700C46741 /* DelegationDataHandler.swift in Sources */, @@ -5519,6 +5400,7 @@ 7F85B76A246A9A7C00ED09B8 /* Details.swift in Sources */, 7F85B76B246A9A7C00ED09B8 /* Description.swift in Sources */, 901F7F4027EB07B800C46741 /* DelegationEntity.swift in Sources */, + 509749CC2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */, 7F85B76C246A9A7C00ED09B8 /* RemoteTransactions.swift in Sources */, 0789670A2742F0890031EA9F /* KeyboardDismissableBaseViewController.swift in Sources */, 7F85B76D246A9A7C00ED09B8 /* TransactionDetailViewController.swift in Sources */, @@ -5939,6 +5821,7 @@ 7F85B866246A9AB600ED09B8 /* UILabel+localized.swift in Sources */, 7F85B867246A9AB600ED09B8 /* OriginTypeEnum.swift in Sources */, 901F7F4127EB07B800C46741 /* DelegationEntity.swift in Sources */, + 509749CD2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */, 7F85B868246A9AB600ED09B8 /* AccountDetailsIdentityDataViewController.swift in Sources */, 0789670B2742F0890031EA9F /* KeyboardDismissableBaseViewController.swift in Sources */, 7F85B869246A9AB600ED09B8 /* Details.swift in Sources */, @@ -6353,6 +6236,7 @@ 19C2E6C9E6A23B6A3A72AF23 /* Description.swift in Sources */, 901F7F3A27EB07AE00C46741 /* BakerEntity.swift in Sources */, 7F85B8F32472D39800ED09B8 /* MoreMenuViewController.swift in Sources */, + 509749CB2C2EE25100D28D6B /* UnshiedSunsetView.swift in Sources */, 901F7F4427EB4D0700C46741 /* DelegationDataHandler.swift in Sources */, 89CF2D35281167EF00742E1E /* BakerPoolSettingsViewController.swift in Sources */, 7FA0AE9424598D6500B7673F /* RemoteTransactions.swift in Sources */, diff --git a/ConcordiumWallet/Model/Database/TransferEntity.swift b/ConcordiumWallet/Model/Database/TransferEntity.swift index 342df136..b43a1130 100644 --- a/ConcordiumWallet/Model/Database/TransferEntity.swift +++ b/ConcordiumWallet/Model/Database/TransferEntity.swift @@ -64,12 +64,8 @@ extension TransferDataType { balanceChange = Int(cost) ?? 0 default: switch transferType { - case .simpleTransfer, .transferToSecret: // transfer to public is included even if not finalized + case .simpleTransfer: balanceChange = amountAsInt() + (Int(cost) ?? 0) - case .transferToPublic: - balanceChange = -amountAsInt() + (Int(cost) ?? 0) - case .encryptedTransfer: - balanceChange = (Int(cost) ?? 0) case .registerDelegation, .removeDelegation, .updateDelegation: balanceChange = (Int(cost) ?? 0) case .registerBaker, .updateBakerKeys, .updateBakerPool, .updateBakerStake, .removeBaker, .configureBaker: @@ -93,10 +89,6 @@ extension TransferDataType { switch transferType { case .simpleTransfer: balanceChange = 0 - case .transferToSecret: - balanceChange = -amountAsInt()// shielding is included even if not finalized - case .encryptedTransfer, .transferToPublic: - balanceChange = amountAsInt() + 0 // the cost is taken from the public balance case .registerDelegation, .removeDelegation, .updateDelegation: balanceChange = 0 case .registerBaker, .updateBakerKeys, .updateBakerPool, .updateBakerStake, .removeBaker, .configureBaker: diff --git a/ConcordiumWallet/Model/TransferType.swift b/ConcordiumWallet/Model/TransferType.swift index dafa5052..76d70a75 100644 --- a/ConcordiumWallet/Model/TransferType.swift +++ b/ConcordiumWallet/Model/TransferType.swift @@ -10,9 +10,6 @@ import Foundation enum TransferType: String, Codable { case simpleTransfer - case encryptedTransfer - case transferToSecret - case transferToPublic case registerDelegation case updateDelegation diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/Contents.json b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/Contents.json new file mode 100644 index 00000000..5f609be0 --- /dev/null +++ b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ico_unshield.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ico_unshield@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ico_unshield@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield.png b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield.png new file mode 100644 index 0000000000000000000000000000000000000000..b1c3ccb1621d4ea8ab1c0e923354458130441339 GIT binary patch literal 2329 zcmV+!3Fh{RP)1aZeEE1fhYb$SyXJr0pv931V-GI$2m=#16W#eS+Al7Ks5nyC894 z`2~w~i0cAj835Z*A}lmo@|_sMOK8EnH^1F~2ZktBSWQBbUj_23aG{ng zxCsc0^lj#{ObV@4*v=o%7ts;679o)?p8lV0-s{C}bZhs8tppZur>M{%#f4~MPp8m@ zg!P343vYt7>@tO%h7O@gjy_njr$gx6!qSCo(FJs2cIe~`WwKm=PYtq66N*TJfw!pq6#ia!JSf!{VN~MIoO}PaJoChT0Iy!DEPO3kFb_@!4 z9e;HMbaswaMymmh?JA`WDh`1W}yAY@>k`g)-Efz?_(yu$|rK&nO^Y4Xt#o zaXU+5=GEq}m-O$DKP<9?tv#~YW&d|6VVzt<`_1OvHJAf)aRtg!QLF~nSr+V*pi6nO zT`cn1qq{5gbwj28JlHjmxX)k?7#CKh8v!OBf0SaGD={d**`s^=qA8b@U-ru-ap&Q4 zjS8!TOUU7J?LNfec~NmyT-$(^pyjg9RY?|u7!{U6qVQvhupP24jp7O+LlqYe#U2>M zn6O?(-}aXUg->UX?{yn6Tq;G}&HHY6HZIs!=U@n9!U_(H0yJQ-&HuULDNEcY4mQFr z0k*&pMufGyC+%PZfUVUFmlS1*%jHr${1V26+RJn$gas1u74hAsZ@)8n1X4y`sxH>xtvr_4<8DCroqzQF}Vr64oShU2o zS+-|!ov+P8;tCP;tFjLUFd{6XH4?=_IdiStqnvCJaVg}wHvTTYC1J;v2UT7Rd4lvL zak39$re7VGj(D zTUZLA{s}Ip`Oe|jMlTek3w#JUnN{3qj^ewoS9(chhkbFj&@hSI!bU@wG~d~C`>lGT z6$O*pS;ggJL~|5LeP~S37pv_vhK6zEw^(Z&Uoz}F(|5pw;NnDXc1E&@%U$Zhef*4C zA^~5_SVHC=43b+|iZ6SSRc$-P3RRmu=xaGYTCmF`P28VUzglueElTIf$zpVc(evmR8NO6B-0Fpvcw$8g?#;l^1+sM& z&Fm+L8)Q4pTGe?(Dmijp7f^sg!cxD|%g~ApiDd3crLOOwzircg=U(q^ZdhDliNlE> zs9%kbnYORj$!Q1I2??iAfI`9!zO+uG?%-3)nd&$HetdU5A}$Ni?d%+X$YZ^{4}H#2 zVn{#%aK!y;)An~zPK1Bo4_bwUEj)ql*3R)sa0Cj`|KV%%$F#6!wC|G_T{?rU$&(V7 z)T%m28>Z>cdi3UX*%KSErDhP7>FgeVpo(r`bbPAlijJTuKE#N_C^ZXlMBB64?zCO` z!aKXqFX`)6aDpP zsNV69pdebNeDY%$?S9E>wG5BF8pzhVD9|F~W70Vs{4i+lXFskQK6)M!mO?@v>I4PR zH7Jg2dONV({(N=F10*s%PF{_@P6F?%5rimM;A~--nnn*7vk2&oEkysa?&egdwE#A$FwtQ?{@K3ad=$x1uB#{+9rwJE8{#lo(jMhZA3dF;?SFW@d zJ%3vX)Y#mp|KPB3DCg!d^is;JOWZkH)_F8r zL`UmVWu~Rpot32bD^MfkMj3O(O6l{88=tD63!8`KCW$K1S}SV;Ua2qJNo=xe3~SQh zO7rv8!NhzA#SBf}Je2-=sI+`QLo}Ak3dK}N#kGH2L!)F-nbNzz)dk>WYsMcJP{t^0 zE>p#+@vXOwvPET#j4R*^p-5pZnqu^(Yo6=$yBtn&nK4b(KKs;ZxmjHpeN&t_oA5mD zReMEU16wI&zV_m*ltU_t16RJ8H^s%_Hhr6v!;Md}@I*Qbn+I71<_hZ56(@G?n1X_T zj#G8EsO3_AD1aAC#+8ff%#G2HWio7N@a!hnGl#C zd5K5UB8Hlba3o-QYJ5#iO-)TrO-)VB|BZhE#;it+zy(5900000NkvXXu0mjf{OVn& literal 0 HcmV?d00001 diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@2x.png b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e82e40d1ee586d79a9c5a23dec933593adb2dce1 GIT binary patch literal 4544 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 P|8YZIQ=Mup9N~WeWSL5^ literal 0 HcmV?d00001 diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_1.svg b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_1.svg deleted file mode 100644 index 987aa63e..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_1.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_2.svg b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_2.svg deleted file mode 100644 index e32e74f4..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/shielding_2.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/unshielding_1.svg b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/unshielding_1.svg deleted file mode 100644 index 7f50c44d..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/images/unshielding_1.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_1.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_1.html deleted file mode 100644 index bfd05594..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_1.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - -

- The shielded balance is the part of the balance of an account that only the owner of the account can see. To - shield a part of your balance you transfer CCD from your balance to your shielded balance. -

-

- From your shielded balance you can make shielded transfers to other accounts or unshield all or part of your - shielded balance back again. When you unshield, the funds are returned to your balance. -

- - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_2.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_2.html deleted file mode 100644 index 187eba71..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_2.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -

- Other participants in the network will be able to see the amount of CCD you move between your public and - shielded balances. However, they can't see the amount stored on the shielded balance or the amounts in any - shielded transfers going in or out of the account. -

-

- The shielded transfer transactions are visible on chain including the optional memo. -

-

- - Only the amount of CCD in the shielded transfer will be private. - -

- - - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_3.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_3.html deleted file mode 100644 index 9f9cd761..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_3.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -

- A shielding transaction is a transfer that moves CCD from your balance to your shielded balance in your account. -

-

- You decide how much you want to move to the shielded balance. Just make sure the remaining balance is sufficient - to cover the transaction fees. The amount in this transaction will be visible on the blockchain. -

-
- -
- - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_4.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_4.html deleted file mode 100644 index bcb4db2d..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_4.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - -

- A shielded transfer is a transfer from the shielded balance of one account to a shielded balance of another - account. -

-

- The amount that is transferred is only visible to the sender and the receiver. The transaction fee is higher - than a regular transfer and is paid by the sender account. -

-

- You will be able to see a diagram of this on the next slide. -

- - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_5.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_5.html deleted file mode 100644 index 87e67c21..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_5.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - -
- -
- - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_6.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_6.html deleted file mode 100644 index 90d75c84..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_6.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -

- An unshielding transaction moves CCD from your shielded balance to the balance of the same account. -

-

- The amount in this transaction will be visible on the blockchain, and the fee will always be paid from the - balance. -

-
- -
- - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_7.html b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_7.html deleted file mode 100644 index df1ca030..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/shielded_balance_onboarding_en_7.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - -

- IMPORTANT -

-

- All transfers and transactions cost a fee to process, including shielding and unshielding transactions and - transfers. -

-

- Transaction fees are always indicated before you process a transaction and are deducted from the balance of the - sender account. -

- - - diff --git a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/styles/shielded_balance_style.css b/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/styles/shielded_balance_style.css deleted file mode 100644 index 1a059b26..00000000 --- a/ConcordiumWallet/Resources/SchieldedBalanceOnboarding/styles/shielded_balance_style.css +++ /dev/null @@ -1,10 +0,0 @@ -body { - font-family: -apple-system; - font-size: 14px; - font-weight: 400; - text-align: center; -} - -p { - text-align: justify; -} diff --git a/ConcordiumWallet/Service/MobileWallet.swift b/ConcordiumWallet/Service/MobileWallet.swift index 33a5c5cd..8e9c821b 100644 --- a/ConcordiumWallet/Service/MobileWallet.swift +++ b/ConcordiumWallet/Service/MobileWallet.swift @@ -131,9 +131,6 @@ class MobileWallet: MobileWalletProtocol { let revealedAttributes = account.revealedAttributes.map({ $0.key }) - -// return requestPasswordDelegate.requestUserPassword(keychain: keychain) -// .flatMap { (pwHash) -> AnyPublisher in return self.createCredential(global: global, account: account, revealedAttributes: revealedAttributes, @@ -244,9 +241,6 @@ class MobileWallet: MobileWalletProtocol { let privateAccountKeys = try getPrivateAccountKeys(for: fromAccount, pwHash: pwHash).get() var secretEncryptionKey: String? - if transferType == .transferToPublic || transferType == .encryptedTransfer { - secretEncryptionKey = try getSecretEncryptionKey(for: fromAccount, pwHash: pwHash).get() - } let makeCreateTransferRequest = MakeCreateTransferRequest(from: fromAccount.address, to: toAccount, @@ -276,12 +270,6 @@ class MobileWallet: MobileWalletProtocol { switch transferType { case .simpleTransfer: return try CreateTransferRequest(walletFacade.createTransfer(input: input)) - case .transferToSecret: - return try CreateTransferRequest(walletFacade.createShielding(input: input)) - case .transferToPublic: - return try CreateTransferRequest(walletFacade.createUnshielding(input: input)) - case .encryptedTransfer: - return try CreateTransferRequest(walletFacade.createEncrypted(input: input)) case .registerDelegation, .removeDelegation, .updateDelegation: return try CreateTransferRequest(walletFacade.createConfigureDelegation(input: input)) case .registerBaker, .updateBakerKeys, .updateBakerPool, .updateBakerStake, .removeBaker, .configureBaker: diff --git a/ConcordiumWallet/Storyboards/Base.lproj/Account.storyboard b/ConcordiumWallet/Storyboards/Base.lproj/Account.storyboard index a3ea5716..007a2b72 100644 --- a/ConcordiumWallet/Storyboards/Base.lproj/Account.storyboard +++ b/ConcordiumWallet/Storyboards/Base.lproj/Account.storyboard @@ -1,9 +1,9 @@ - + - + @@ -13,23 +13,23 @@ - + - + - - + + - + @@ -51,8 +51,8 @@ - - + + @@ -194,7 +194,7 @@ - -