diff --git a/ConcordiumWallet.xcodeproj/project.pbxproj b/ConcordiumWallet.xcodeproj/project.pbxproj index 4fefba98..49dd9a9b 100644 --- a/ConcordiumWallet.xcodeproj/project.pbxproj +++ b/ConcordiumWallet.xcodeproj/project.pbxproj @@ -628,6 +628,10 @@ 19C2EFF1CEC944A7FCBC63C5 /* SingleSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C2ED4F802767556C4ABBE9 /* SingleSection.swift */; }; 19C2EFFF5510E28CD0A195C9 /* 4.1.2.RX_backend_accBalance.json in Resources */ = {isa = PBXBuildFile; fileRef = 19C2EEC7EFFF9C46A7786EF7 /* 4.1.2.RX_backend_accBalance.json */; }; 378E0C441D6924E404784EAA /* AutoMockable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A153AF2B8166B46422D71155 /* AutoMockable.generated.swift */; }; + 509749C42C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C32C19A0BA00D28D6B /* UnshiedSunsetView.swift */; }; + 509749C52C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C32C19A0BA00D28D6B /* UnshiedSunsetView.swift */; }; + 509749C62C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C32C19A0BA00D28D6B /* UnshiedSunsetView.swift */; }; + 509749C72C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509749C32C19A0BA00D28D6B /* UnshiedSunsetView.swift */; }; 50F8F98B2C620FCC004447CA /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 50F8F98A2C620FCC004447CA /* CHANGELOG.md */; }; 50F8F98C2C620FCC004447CA /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 50F8F98A2C620FCC004447CA /* CHANGELOG.md */; }; 50F8F98D2C620FCC004447CA /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 50F8F98A2C620FCC004447CA /* CHANGELOG.md */; }; @@ -2203,10 +2207,6 @@ 8D4097B328323F1600EBB9EA /* AppSettingsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4097B128323F1600EBB9EA /* AppSettingsService.swift */; }; 8D4097B428323F1600EBB9EA /* AppSettingsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4097B128323F1600EBB9EA /* AppSettingsService.swift */; }; 8D4097B528323F1600EBB9EA /* AppSettingsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4097B128323F1600EBB9EA /* AppSettingsService.swift */; }; - 8D5776D0295B42930059C309 /* ButtonsShielded.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5776CF295B42930059C309 /* ButtonsShielded.swift */; }; - 8D5776D1295B42930059C309 /* ButtonsShielded.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5776CF295B42930059C309 /* ButtonsShielded.swift */; }; - 8D5776D2295B42930059C309 /* ButtonsShielded.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5776CF295B42930059C309 /* ButtonsShielded.swift */; }; - 8D5776D3295B42930059C309 /* ButtonsShielded.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5776CF295B42930059C309 /* ButtonsShielded.swift */; }; 8D61F4752955E845005E9410 /* ButtonSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D61F4742955E845005E9410 /* ButtonSlider.swift */; }; 8D61F4762955E845005E9410 /* ButtonSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D61F4742955E845005E9410 /* ButtonSlider.swift */; }; 8D61F4772955E845005E9410 /* ButtonSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D61F4742955E845005E9410 /* ButtonSlider.swift */; }; @@ -3069,6 +3069,7 @@ 19C2EFD00DA2B13DEB773973 /* IdentityProviderError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentityProviderError.swift; sourceTree = ""; }; 19C2EFED051EE58467949EAA /* AddRecipientPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddRecipientPresenter.swift; sourceTree = ""; }; 19C2EFF2620E0CD7DECE642A /* ChoiceArData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChoiceArData.swift; sourceTree = ""; }; + 509749C32C19A0BA00D28D6B /* UnshiedSunsetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnshiedSunsetView.swift; sourceTree = ""; }; 50F8F98A2C620FCC004447CA /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; 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 = ""; }; @@ -3427,7 +3428,6 @@ 89EB9F5B27FEE959005F8633 /* GeneratedBakerKeys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedBakerKeys.swift; sourceTree = ""; }; 8D4097AC28323A1F00EBB9EA /* AppSettingsResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettingsResponse.swift; sourceTree = ""; }; 8D4097B128323F1600EBB9EA /* AppSettingsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettingsService.swift; sourceTree = ""; }; - 8D5776CF295B42930059C309 /* ButtonsShielded.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonsShielded.swift; sourceTree = ""; }; 8D61F4742955E845005E9410 /* ButtonSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonSlider.swift; sourceTree = ""; }; 8D9E39842950485A007ED183 /* ExportTransactionLogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportTransactionLogView.swift; sourceTree = ""; }; 8D9E39892950552E007ED183 /* ExportTransactionLogPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportTransactionLogPresenter.swift; sourceTree = ""; }; @@ -4333,6 +4333,14 @@ path = Network; sourceTree = ""; }; + 509749C22C199B7400D28D6B /* UnshiedSunset */ = { + isa = PBXGroup; + children = ( + 509749C32C19A0BA00D28D6B /* UnshiedSunsetView.swift */, + ); + path = UnshiedSunset; + sourceTree = ""; + }; 5243C030278E2360005CAC8D /* VerifyIdsAndAccounts */ = { isa = PBXGroup; children = ( @@ -4937,6 +4945,7 @@ 7FF07AE323EAE09B00F1FC04 /* Views */ = { isa = PBXGroup; children = ( + 509749C22C199B7400D28D6B /* UnshiedSunset */, 0111D7212A2DFE7000E05D35 /* WalletConnect */, 19C2E50D27878D62320AE14B /* ScanQR */, 891B19F628A6132D00F4B0D6 /* SeedIdentities */, @@ -5610,7 +5619,6 @@ 19C2E412525C6ED4F2F87A8C /* TransactionsLoadingHandler.swift */, 5251EF8C27BA6802006991DD /* ShowShieldedDelegate.swift */, 8D61F4742955E845005E9410 /* ButtonSlider.swift */, - 8D5776CF295B42930059C309 /* ButtonsShielded.swift */, ); path = AccountDetails; sourceTree = ""; @@ -6668,6 +6676,7 @@ 64FD333A25FF8A7C00563703 /* KeyList.swift in Sources */, 7F48C1AD244DCD0B00997684 /* AccountsCoordinator.swift in Sources */, 07519F9226FCBF6C00F4E6E3 /* HashingHelper.swift in Sources */, + 509749C42C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */, 896B423E28B49A6700D1F271 /* SelectIdentityPresenter.swift in Sources */, 52DCA9F627CD106600CDF85E /* BurgerMenuOptionCell.swift in Sources */, 07519F9D26FDC0EB00F4E6E3 /* EncodingProtocol.swift in Sources */, @@ -6782,7 +6791,6 @@ 7F48C1E0244DCD0B00997684 /* AppSettings.swift in Sources */, 901F7EEE27E8A6A600C46741 /* DelegationTarget.swift in Sources */, 7F48C1E1244DCD0B00997684 /* UIView+Additions.swift in Sources */, - 8D5776D0295B42930059C309 /* ButtonsShielded.swift in Sources */, 7F48C1E2244DCD0B00997684 /* PasswordFieldViewController.swift in Sources */, 893CAC46286DA7F000BDF84C /* View+Modifiers.swift in Sources */, 070D61D727B2907000B6903C /* OnboardingCarouselViewController.swift in Sources */, @@ -7225,7 +7233,6 @@ 89D467F3289B9CF0007D3FC8 /* IdentityCreation.swift in Sources */, 7F85B761246A9A7C00ED09B8 /* AccountCell.swift in Sources */, 5237188525753C4700B2BC31 /* MakeGenerateAaccountsRequest.swift in Sources */, - 8D5776D2295B42930059C309 /* ButtonsShielded.swift in Sources */, 8DD9B1BD294C7D60003E8CB8 /* CookieJar.swift in Sources */, 52A6A78024F909CD00138D83 /* IDObjectRequestWrapper.swift in Sources */, 89B34A302892B6C50059891C /* RecoveryPhraseInputViewModel.swift in Sources */, @@ -7418,6 +7425,7 @@ 89B34A352892B7280059891C /* RecoveryPhraseInputView.swift in Sources */, CD3E4A912A5588D700D7FBF3 /* SignMessagePayload.swift in Sources */, 7FF9191E2511505C00B1032B /* ImportViewController.swift in Sources */, + 509749C62C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */, 7F85B7B1246A9A7C00ED09B8 /* TransactionDetailInfoCellView.swift in Sources */, 7F85B7B2246A9A7C00ED09B8 /* TransactionsLoadingHandler.swift in Sources */, 89D46844289BF99C007D3FC8 /* SeedIDRequest.swift in Sources */, @@ -7820,7 +7828,6 @@ 89D467F4289B9CF0007D3FC8 /* IdentityCreation.swift in Sources */, 7F85B85C246A9AB600ED09B8 /* Aci.swift in Sources */, 5237188625753C4700B2BC31 /* MakeGenerateAaccountsRequest.swift in Sources */, - 8D5776D3295B42930059C309 /* ButtonsShielded.swift in Sources */, 8DD9B1BE294C7D60003E8CB8 /* CookieJar.swift in Sources */, 52A6A78124F909CD00138D83 /* IDObjectRequestWrapper.swift in Sources */, 89B34A312892B6C50059891C /* RecoveryPhraseInputViewModel.swift in Sources */, @@ -8013,6 +8020,7 @@ 89B34A362892B7280059891C /* RecoveryPhraseInputView.swift in Sources */, CD3E4A922A5588D700D7FBF3 /* SignMessagePayload.swift in Sources */, 7FF9191F2511505C00B1032B /* ImportViewController.swift in Sources */, + 509749C72C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */, 7F85B8AE246A9AB600ED09B8 /* AccountDetailsPresenter.swift in Sources */, 7F85B8AF246A9AB600ED09B8 /* TransactionViewModel.swift in Sources */, 89D46845289BF99C007D3FC8 /* SeedIDRequest.swift in Sources */, @@ -8515,6 +8523,7 @@ 89CF2D31281167EF00742E1E /* BakerPoolSettingsPresenter.swift in Sources */, C96632522459B85A0087A1F2 /* AccountTransactionsDataPresenter.swift in Sources */, 89D467FC289B9EB9007D3FC8 /* IDRequestV1.swift in Sources */, + 509749C52C19A0BA00D28D6B /* UnshiedSunsetView.swift in Sources */, 19C2EAE949D6E4BFF9E5A373 /* Metadata.swift in Sources */, 5236EA4225134C4900214174 /* IdentityWrapperShell.swift in Sources */, 7F168A0924812B7100DE429E /* SendFundConfirmationPresenter.swift in Sources */, @@ -8705,7 +8714,6 @@ 89B34A532897B6140059891C /* Collections+Indexed.swift in Sources */, 19C2E85AC21620CFD6D4941E /* EncryptionMetadata.swift in Sources */, 19C2EAB6E48A28C1990D3D30 /* ExportContainer.swift in Sources */, - 8D5776D1295B42930059C309 /* ButtonsShielded.swift in Sources */, 89B34A392893D0A50059891C /* PageList.swift in Sources */, 19C2E106001E26A82B164069 /* CreateExportPasswordPresenter.swift in Sources */, 89D46853289CF390007D3FC8 /* CreateSeedIdentityView.swift in Sources */, @@ -8856,7 +8864,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; MOCK = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DMOCK"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.mocked; @@ -8889,7 +8897,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; MOCK = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DMOCK"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.mocked; @@ -8907,11 +8915,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "ConcordiumWallet/Resources/Entitlements/Concordium ID.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 64; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; + DEVELOPMENT_TEAM = K762RM4LQ3; ENABLE_BITCODE = NO; INFOPLIST_FILE = "ConcordiumWallet/Resources/ConcordiumWalletTestNet-Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "TestNet Seed Phrase Wallet"; @@ -8925,12 +8931,11 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DTESTNET"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.testnet; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore software.concordium.mobilewallet.seedphrase.testnet"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG ENABLE_GTU_DROP"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ConcordiumWallet-Briding-Header-File.h"; SWIFT_VERSION = 5.0; @@ -8945,11 +8950,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "ConcordiumWallet/Resources/Entitlements/Concordium ID.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 64; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; + DEVELOPMENT_TEAM = K762RM4LQ3; ENABLE_BITCODE = NO; INFOPLIST_FILE = "ConcordiumWallet/Resources/ConcordiumWalletTestNet-Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "TestNet Seed Phrase Wallet"; @@ -8963,12 +8966,11 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DTESTNET"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.testnet; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore software.concordium.mobilewallet.seedphrase.testnet"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ENABLE_GTU_DROP; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ConcordiumWallet-Briding-Header-File.h"; SWIFT_VERSION = 5.0; @@ -8999,7 +9001,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DMAINNET"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.mainnet; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -9035,7 +9037,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DMAINNET"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.mainnet; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -9189,7 +9191,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DSTAGINGNET"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.stagenet; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -9224,7 +9226,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Dependencies", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -DSTAGINGNET"; PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.stagenet; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ConcordiumWallet/Model/Database/TransferEntity.swift b/ConcordiumWallet/Model/Database/TransferEntity.swift index c13d933e..37aace20 100644 --- a/ConcordiumWallet/Model/Database/TransferEntity.swift +++ b/ConcordiumWallet/Model/Database/TransferEntity.swift @@ -67,12 +67,8 @@ extension TransferDataType { balanceChange = Int(cost) ?? 0 default: switch transferType { - case .simpleTransfer, .transferToSecret: // transfer to public is included even if not finalized + case .simpleTransfer: // transfer to public is included even if not finalized 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: @@ -98,10 +94,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 69b26f4f..337a8844 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 @@ -50,12 +47,6 @@ enum TransferType: String, Codable { switch self { case .simpleTransfer: return .simpleTransfer - case .encryptedTransfer: - return .encryptedTransfer - case .transferToSecret: - return .transferToSecret - case .transferToPublic: - return .transferToPublic case .registerDelegation: return .registerDelegation case .updateDelegation: @@ -84,9 +75,6 @@ enum TransferType: String, Codable { /// (see https://github.com/Concordium/concordium-wallet-proxy/blob/80ef058749d13f83e1f1afdecc6b1345f8def5fa/src/Proxy.hs#L687). enum WalletProxyTransferType: String, Codable { case simpleTransfer - case encryptedTransfer - case transferToSecret - case transferToPublic case registerDelegation case updateDelegation diff --git a/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/Contents.json b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/Contents.json b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/Contents.json new file mode 100644 index 00000000..5f609be0 --- /dev/null +++ b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/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/UnshiedSunset/ico_unshield.imageset/ico_unshield.png b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield.png new file mode 100644 index 00000000..b1c3ccb1 Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield.png differ diff --git a/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield@2x.png b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield@2x.png new file mode 100644 index 00000000..e82e40d1 Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield@2x.png differ diff --git a/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield@3x.png b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield@3x.png new file mode 100644 index 00000000..4b7450ea Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/UnshiedSunset/ico_unshield.imageset/ico_unshield@3x.png differ diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/Contents.json b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/Contents.json new file mode 100644 index 00000000..aa3724b4 --- /dev/null +++ b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "DownloadSimple.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "DownloadSimple@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "DownloadSimple@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple.png b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple.png new file mode 100644 index 00000000..582d15d1 Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple.png differ diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple@2x.png b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple@2x.png new file mode 100644 index 00000000..17f03bae Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple@2x.png differ diff --git a/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple@3x.png b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple@3x.png new file mode 100644 index 00000000..56156c60 Binary files /dev/null and b/ConcordiumWallet/Resources/Assets.xcassets/icons/unshield_export_icon.imageset/DownloadSimple@3x.png differ diff --git a/ConcordiumWallet/Service/MobileWallet.swift b/ConcordiumWallet/Service/MobileWallet.swift index 5bd1fcd0..2d8d5ff4 100644 --- a/ConcordiumWallet/Service/MobileWallet.swift +++ b/ConcordiumWallet/Service/MobileWallet.swift @@ -255,9 +255,6 @@ class MobileWallet: MobileWalletProtocol { var secretEncryptionKey: String? var type: String? = nil - if transferType == .transferToPublic || transferType == .encryptedTransfer { - secretEncryptionKey = try getSecretEncryptionKey(for: fromAccount, pwHash: pwHash).get() - } if transferType == .contractUpdate { type = "Update" } @@ -295,12 +292,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 c562c55c..a1f6cbc0 100644 --- a/ConcordiumWallet/Storyboards/Base.lproj/Account.storyboard +++ b/ConcordiumWallet/Storyboards/Base.lproj/Account.storyboard @@ -1,9 +1,9 @@ - + - + @@ -434,7 +434,7 @@ - + @@ -442,7 +442,7 @@ -