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 00000000..b1c3ccb1 Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield.png differ 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 00000000..e82e40d1 Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@2x.png differ diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@3x.png b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@3x.png new file mode 100644 index 00000000..4b7450ea Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/icons/ico_unshield.imageset/ico_unshield@3x.png differ 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 @@ - -