diff --git a/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/Contents.json index 69cfed3a94..b90357a1fd 100644 --- a/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/Contents.json +++ b/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "approve-with-pin.svg", + "filename" : "iconApproveWithPin.pdf", "idiom" : "universal" } ], diff --git a/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/approve-with-pin.svg b/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/approve-with-pin.svg deleted file mode 100644 index b159a204db..0000000000 --- a/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/approve-with-pin.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/iconApproveWithPin.pdf b/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/iconApproveWithPin.pdf new file mode 100644 index 0000000000..224cc1d2e3 Binary files /dev/null and b/novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/iconApproveWithPin.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/Contents.json index 16a6b9a1b1..2ed5a5f58f 100644 --- a/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/Contents.json +++ b/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "authentication.svg", + "filename" : "iconBiometricAuth.pdf", "idiom" : "universal" } ], diff --git a/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/authentication.svg b/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/authentication.svg deleted file mode 100644 index 218b5b2e9a..0000000000 --- a/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/authentication.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/iconBiometricAuth.pdf b/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/iconBiometricAuth.pdf new file mode 100644 index 0000000000..fdd571583c Binary files /dev/null and b/novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/iconBiometricAuth.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Contents.json index 5bd4548d82..c771263fb1 100644 --- a/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Contents.json +++ b/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Currency.pdf", + "filename" : "iconCurrency.pdf", "idiom" : "universal" } ], diff --git a/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Currency.pdf b/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/iconCurrency.pdf similarity index 98% rename from novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Currency.pdf rename to novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/iconCurrency.pdf index 59c0b89e23..a5678e615d 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Currency.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/iconCurrency.pdf differ diff --git a/novawallet/Assets.xcassets/iconEmail.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconEmail.imageset/Contents.json similarity index 100% rename from novawallet/Assets.xcassets/iconEmail.imageset/Contents.json rename to novawallet/Assets.xcassets/iconsSettings/iconEmail.imageset/Contents.json diff --git a/novawallet/Assets.xcassets/iconEmail.imageset/iconEmail.pdf b/novawallet/Assets.xcassets/iconsSettings/iconEmail.imageset/iconEmail.pdf similarity index 98% rename from novawallet/Assets.xcassets/iconEmail.imageset/iconEmail.pdf rename to novawallet/Assets.xcassets/iconsSettings/iconEmail.imageset/iconEmail.pdf index ffbcaa34ea..26f99da9fb 100644 Binary files a/novawallet/Assets.xcassets/iconEmail.imageset/iconEmail.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconEmail.imageset/iconEmail.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconGithub.imageset/iconGithub.pdf b/novawallet/Assets.xcassets/iconsSettings/iconGithub.imageset/iconGithub.pdf index 7e66c9a72a..ed062c604f 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconGithub.imageset/iconGithub.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconGithub.imageset/iconGithub.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconLanguage.imageset/iconLanguage.pdf b/novawallet/Assets.xcassets/iconsSettings/iconLanguage.imageset/iconLanguage.pdf index 9d88e2c8cd..bbe0ebb541 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconLanguage.imageset/iconLanguage.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconLanguage.imageset/iconLanguage.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/Contents.json deleted file mode 100644 index bdf3632c22..0000000000 --- a/novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "iconNetworks.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/iconNetworks.pdf b/novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/iconNetworks.pdf deleted file mode 100644 index e365e07e54..0000000000 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/iconNetworks.pdf and /dev/null differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/iconPinCode.pdf b/novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/iconPinCode.pdf deleted file mode 100644 index 794ce6b88c..0000000000 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/iconPinCode.pdf and /dev/null differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/Contents.json similarity index 76% rename from novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/Contents.json rename to novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/Contents.json index f723b57d50..8c7c43db77 100644 --- a/novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/Contents.json +++ b/novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "iconPinCode.pdf", + "filename" : "iconPincode.pdf", "idiom" : "universal" } ], diff --git a/novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/iconPincode.pdf b/novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/iconPincode.pdf new file mode 100644 index 0000000000..a4e74c653e Binary files /dev/null and b/novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/iconPincode.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconStar.imageset/iconStar.pdf b/novawallet/Assets.xcassets/iconsSettings/iconStar.imageset/iconStar.pdf index a10cbe97b6..2a0bcd1869 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconStar.imageset/iconStar.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconStar.imageset/iconStar.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconTelegram.imageset/iconTelegram.pdf b/novawallet/Assets.xcassets/iconsSettings/iconTelegram.imageset/iconTelegram.pdf index b04c77c310..402bd669cf 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconTelegram.imageset/iconTelegram.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconTelegram.imageset/iconTelegram.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconTerms.imageset/iconTerms.pdf b/novawallet/Assets.xcassets/iconsSettings/iconTerms.imageset/iconTerms.pdf index 7b3456dc89..293619155a 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconTerms.imageset/iconTerms.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconTerms.imageset/iconTerms.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconTwitter.imageset/iconTwitter.pdf b/novawallet/Assets.xcassets/iconsSettings/iconTwitter.imageset/iconTwitter.pdf index 683a756071..01a0a5616f 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconTwitter.imageset/iconTwitter.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconTwitter.imageset/iconTwitter.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconWallets.imageset/iconWallets.pdf b/novawallet/Assets.xcassets/iconsSettings/iconWallets.imageset/iconWallets.pdf index 480f1e39ad..f4a714b7b7 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconWallets.imageset/iconWallets.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconWallets.imageset/iconWallets.pdf differ diff --git a/novawallet/Assets.xcassets/iconsSettings/iconWebsite.imageset/iconWebsite.pdf b/novawallet/Assets.xcassets/iconsSettings/iconWebsite.imageset/iconWebsite.pdf index 5b86ab8a61..1ff4c77c66 100644 Binary files a/novawallet/Assets.xcassets/iconsSettings/iconWebsite.imageset/iconWebsite.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconWebsite.imageset/iconWebsite.pdf differ diff --git a/novawallet/Assets.xcassets/iconYoutube.imageset/Contents.json b/novawallet/Assets.xcassets/iconsSettings/iconYoutube.imageset/Contents.json similarity index 100% rename from novawallet/Assets.xcassets/iconYoutube.imageset/Contents.json rename to novawallet/Assets.xcassets/iconsSettings/iconYoutube.imageset/Contents.json diff --git a/novawallet/Assets.xcassets/iconYoutube.imageset/iconYoutube.pdf b/novawallet/Assets.xcassets/iconsSettings/iconYoutube.imageset/iconYoutube.pdf similarity index 98% rename from novawallet/Assets.xcassets/iconYoutube.imageset/iconYoutube.pdf rename to novawallet/Assets.xcassets/iconsSettings/iconYoutube.imageset/iconYoutube.pdf index 5dc7468396..0115e0c588 100644 Binary files a/novawallet/Assets.xcassets/iconYoutube.imageset/iconYoutube.pdf and b/novawallet/Assets.xcassets/iconsSettings/iconYoutube.imageset/iconYoutube.pdf differ diff --git a/novawallet/Common/Configs/ApplicationConfigs.swift b/novawallet/Common/Configs/ApplicationConfigs.swift index 53d0fe12ab..11d786b1ae 100644 --- a/novawallet/Common/Configs/ApplicationConfigs.swift +++ b/novawallet/Common/Configs/ApplicationConfigs.swift @@ -144,9 +144,9 @@ extension ApplicationConfig: ApplicationConfigProtocol { var xcmTransfersURL: URL { #if F_RELEASE - URL(string: "https://raw.githubusercontent.com/nova-wallet/nova-utils/master/xcm/v3/transfers.json")! + URL(string: "https://raw.githubusercontent.com/nova-wallet/nova-utils/master/xcm/v4/transfers.json")! #else - URL(string: "https://raw.githubusercontent.com/nova-wallet/nova-utils/master/xcm/v3/transfers_dev.json")! + URL(string: "https://raw.githubusercontent.com/nova-wallet/nova-utils/master/xcm/v4/transfers_dev.json")! #endif } diff --git a/novawallet/Common/Ledger/SupportedLedgerApps.swift b/novawallet/Common/Ledger/SupportedLedgerApps.swift index 631126fda3..cd6ca76013 100644 --- a/novawallet/Common/Ledger/SupportedLedgerApps.swift +++ b/novawallet/Common/Ledger/SupportedLedgerApps.swift @@ -24,7 +24,8 @@ extension SupportedLedgerApp { SupportedLedgerApp(chainId: KnowChainId.nodle, coin: 1003, cla: 0x98, type: .substrate), SupportedLedgerApp(chainId: KnowChainId.edgeware, coin: 523, cla: 0x94, type: .substrate), SupportedLedgerApp(chainId: KnowChainId.polymesh, coin: 595, cla: 0x91, type: .substrate), - SupportedLedgerApp(chainId: KnowChainId.xxNetwork, coin: 1955, cla: 0xA3, type: .substrate) + SupportedLedgerApp(chainId: KnowChainId.xxNetwork, coin: 1955, cla: 0xA3, type: .substrate), + SupportedLedgerApp(chainId: KnowChainId.astar, coin: 810, cla: 0xA9, type: .substrate) ] } diff --git a/novawallet/Common/Model/KnownChainIds.swift b/novawallet/Common/Model/KnownChainIds.swift index e7806bdbaf..d289a9578a 100644 --- a/novawallet/Common/Model/KnownChainIds.swift +++ b/novawallet/Common/Model/KnownChainIds.swift @@ -12,6 +12,7 @@ enum KnowChainId { static let polymesh = "6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063" static let centrifuge = "b3db41421702df9a7fcac62b53ffeac85f7853cc4e689e0b93aeb3db18c09d82" static let xxNetwork = "50dd5d206917bf10502c68fb4d18a59fc8aa31586f4e8856b493e43544aa82aa" + static let astar = "9eb76c5184c4ab8679d2d5d819fdf90b9c001403e9e17da2e14b6d8aec4029c6" static let kiltPelegrine = "a0c6e3bac382b316a68bca7141af1fba507207594c761076847ce358aeedcc21" static let kiltSpiritnet = "411f057b9107718c9624d6aa4a3f23c1653898297f3d4d529d9bb6511a39dd21" static let moonbeam = "fe58ea77779b7abda7da4ec526d14db9b1e9cd40a217c34892af80a9b332b76d" diff --git a/novawallet/Common/Model/Xcm/XcmTransferFactory.swift b/novawallet/Common/Model/Xcm/XcmTransferFactory.swift index 3f6401581a..ca394903b3 100644 --- a/novawallet/Common/Model/Xcm/XcmTransferFactory.swift +++ b/novawallet/Common/Model/Xcm/XcmTransferFactory.swift @@ -298,7 +298,7 @@ final class XcmTransferFactory { case Xcm.Instruction.fieldReserveAssetDeposited: return .reserveAssetDeposited([asset]) case Xcm.Instruction.fieldBuyExecution: - let value = Xcm.BuyExecutionValue(fees: asset, weightLimit: .limited(weight: .init(value: 0))) + let value = Xcm.BuyExecutionValue(fees: asset, weightLimit: .unlimited) return .buyExecution(value) case Xcm.Instruction.fieldDepositAsset: let value = Xcm.DepositAssetValue(assets: .wild(.all), maxAssets: 1, beneficiary: destination) diff --git a/novawallet/Common/Services/ExtrinsicService/Substrate/Xcm/XcmTransferService+Compose.swift b/novawallet/Common/Services/ExtrinsicService/Substrate/Xcm/XcmTransferService+Compose.swift index 607fcf195d..657757dfe4 100644 --- a/novawallet/Common/Services/ExtrinsicService/Substrate/Xcm/XcmTransferService+Compose.swift +++ b/novawallet/Common/Services/ExtrinsicService/Substrate/Xcm/XcmTransferService+Compose.swift @@ -160,14 +160,11 @@ extension XcmTransferService { dependingOn moduleResolutionOperation: BaseOperation, callPathFactory: @escaping (String) -> CallCodingPath, destinationAssetOperation: BaseOperation, - maxWeight: BigUInt, - runtimeProvider: RuntimeProviderProtocol + maxWeight _: BigUInt, + runtimeProvider _: RuntimeProviderProtocol ) -> CompoundOperationWrapper<(ExtrinsicBuilderClosure, CallCodingPath)> { - let coderFactoryOperation = runtimeProvider.fetchCoderFactoryOperation() - let mapOperation = ClosureOperation<(ExtrinsicBuilderClosure, CallCodingPath)> { let module = try moduleResolutionOperation.extractNoCancellableResultData() - let codingFactory = try coderFactoryOperation.extractNoCancellableResultData() let destinationAsset = try destinationAssetOperation.extractNoCancellableResultData() let (destination, beneficiary) = destinationAsset.location.separatingDestinationBenifiary() @@ -175,31 +172,18 @@ extension XcmTransferService { let callPath = callPathFactory(module) - let argName = Xcm.PalletTransferCall.CodingKeys.weightLimit.rawValue - let optWeight = try BlockchainWeightFactory.convertCallVersionedWeightInWeightLimitToJson( - for: .init(path: callPath, argName: argName), - codingFactory: codingFactory, - weight: UInt64(maxWeight) - ) - - guard let weight = optWeight else { - throw XcmTransferServiceError.noArgumentFound(argName) - } - let call = Xcm.PalletTransferCall( destination: destination, beneficiary: beneficiary, assets: assets, feeAssetItem: 0, - weightLimit: .limited(weight: weight) + weightLimit: .unlimited ) return ({ try $0.adding(call: call.runtimeCall(for: callPath)) }, callPath) } - mapOperation.addDependency(coderFactoryOperation) - - return CompoundOperationWrapper(targetOperation: mapOperation, dependencies: [coderFactoryOperation]) + return CompoundOperationWrapper(targetOperation: mapOperation) } private func createOrmlTransferMapping( diff --git a/novawallet/Common/Substrate/Calls/Xcm/XcmOrmlTransfer.swift b/novawallet/Common/Substrate/Calls/Xcm/XcmOrmlTransfer.swift index 2ac175b177..290968e4e1 100644 --- a/novawallet/Common/Substrate/Calls/Xcm/XcmOrmlTransfer.swift +++ b/novawallet/Common/Substrate/Calls/Xcm/XcmOrmlTransfer.swift @@ -78,22 +78,10 @@ extension Xcm { return ({ try $0.adding(call: call.runtimeCall(for: module)) }, path) } else { - let paramNameV2 = OrmlTransferCallV2.CodingKeys.destinationWeightLimit.rawValue - - let optWeightJson = try BlockchainWeightFactory.convertCallVersionedWeightInWeightLimitToJson( - for: .init(path: path, argName: paramNameV2), - codingFactory: codingFactory, - weight: UInt64(weight) - ) - - guard let weightJson = optWeightJson else { - throw XcmTransferServiceError.noArgumentFound(paramNameV2) - } - let call = OrmlTransferCallV2( asset: asset, destination: destination, - destinationWeightLimit: .limited(weight: weightJson) + destinationWeightLimit: .unlimited ) return ({ try $0.adding(call: call.runtimeCall(for: module)) }, path) diff --git a/novawallet/Common/Substrate/Types/Xcm/Message/XcmWeightLimit.swift b/novawallet/Common/Substrate/Types/Xcm/Message/XcmWeightLimit.swift index cd46d4ef15..646b85d3fc 100644 --- a/novawallet/Common/Substrate/Types/Xcm/Message/XcmWeightLimit.swift +++ b/novawallet/Common/Substrate/Types/Xcm/Message/XcmWeightLimit.swift @@ -17,6 +17,7 @@ extension Xcm { switch self { case .unlimited: try container.encode(WeightLimitFields.unlimited) + try container.encode(JSON.null) case let .limited(weight): try container.encode(WeightLimitFields.limited) try container.encode(weight) diff --git a/novawallet/Modules/Settings/ViewModel/SettingsRow.swift b/novawallet/Modules/Settings/ViewModel/SettingsRow.swift index 3ce43b394a..77cc2747f4 100644 --- a/novawallet/Modules/Settings/ViewModel/SettingsRow.swift +++ b/novawallet/Modules/Settings/ViewModel/SettingsRow.swift @@ -72,7 +72,7 @@ extension SettingsRow { case .approveWithPin: return R.image.iconApproveWithPin() case .changePin: - return R.image.iconPinCode() + return R.image.iconPincode() case .telegram: return R.image.iconTelegram() case .youtube: diff --git a/novawallet/Modules/Staking/ControllerAccount/ControllerAccountInteractor.swift b/novawallet/Modules/Staking/ControllerAccount/ControllerAccountInteractor.swift index 15a056e60f..41045490ce 100644 --- a/novawallet/Modules/Staking/ControllerAccount/ControllerAccountInteractor.swift +++ b/novawallet/Modules/Staking/ControllerAccount/ControllerAccountInteractor.swift @@ -209,7 +209,7 @@ extension ControllerAccountInteractor: StakingLocalStorageSubscriber, StakingLoc if let stashId = maybeStashId, let controllerId = maybeControllerId { balanceProvider = subscribeToAssetBalanceProvider( - for: controllerId, + for: stashId, chainId: chainAsset.chain.chainId, assetId: chainAsset.asset.assetId ) diff --git a/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionConfirm/CrowdloanContributionConfirmViewLayout.swift b/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionConfirm/CrowdloanContributionConfirmViewLayout.swift index 630c0ef70a..62b5b7f344 100644 --- a/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionConfirm/CrowdloanContributionConfirmViewLayout.swift +++ b/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionConfirm/CrowdloanContributionConfirmViewLayout.swift @@ -183,6 +183,8 @@ final class CrowdloanContributionConfirmViewLayout: UIView { } let view = TitleValueView() + view.titleLabel.apply(style: .footnotePrimary) + view.valueLabel.apply(style: .footnotePrimary) view.titleLabel.text = R.string.localizable.crowdloanReward(preferredLanguages: locale.rLanguages) contentView.stackView.insertArrangedSubview(view, at: leasingPeriodIndex + 1) diff --git a/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionSetup/CrowdloanContributionSetupViewLayout.swift b/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionSetup/CrowdloanContributionSetupViewLayout.swift index afb78e3a04..532bec925d 100644 --- a/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionSetup/CrowdloanContributionSetupViewLayout.swift +++ b/novawallet/Modules/Vote/Crowdloan/CrowdloanContributionSetup/CrowdloanContributionSetupViewLayout.swift @@ -28,7 +28,16 @@ class CrowdloanContributionSetupViewLayout: UIView { private(set) var rewardDestinationAccountView: CrowdloanRewardDestinationView? - let networkFeeView = NetworkFeeView() + let networkFeeView: NetworkFeeView = .create { view in + view.style = .init( + titleColor: R.color.colorTextPrimary()!, + titleFont: .regularFootnote, + tokenColor: R.color.colorTextPrimary()!, + tokenFont: .regularFootnote, + fiatColor: R.color.colorTextSecondary()!, + fiatFont: .regularFootnote + ) + } private(set) var estimatedRewardView: TitleValueView? @@ -229,6 +238,8 @@ class CrowdloanContributionSetupViewLayout: UIView { } let view = TitleValueView() + view.titleLabel.apply(style: .footnotePrimary) + view.valueLabel.apply(style: .footnotePrimary) view.titleLabel.text = R.string.localizable.crowdloanReward(preferredLanguages: locale.rLanguages) contentView.stackView.insertArrangedSubview(view, at: leasingPeriodIndex + 1) diff --git a/novawallet/en.lproj/Localizable.strings b/novawallet/en.lproj/Localizable.strings index 5a93beab8d..04b073c15b 100644 --- a/novawallet/en.lproj/Localizable.strings +++ b/novawallet/en.lproj/Localizable.strings @@ -950,7 +950,7 @@ "with.yield.boost" = "with Yield Boost"; "without.yield.boost" = "without Yield Boost"; "common.no.changes" = "No changes"; -"common.not.enough.fee.message_v3.8.0" = "You don’t have enough balance to pay the network fee of %@.\nAvailable balance to pay fee after operation: %@"; +"common.not.enough.fee.message_v3.8.0" = "You don’t have enough balance to pay the network fee of %@.\nAvailable balance to pay fee after operation: %@"; "yield.boost.not.enough.execution.fee.message" = "You don’t have enough balance to pay the network fee of %@ and the yield boost execution fee of %@.\nAvailable balance to pay the fee: %@"; "yield.boost.not.enough.execution.fee.title" = "Not enough tokens to pay first execution fee"; "yield.boost.not.enough.threshold.message" = "You don’t have enough balance to pay the network fee of %@ and not drop below the threshold %@.\nAvailable balance to pay the fee: %@"; @@ -1240,4 +1240,4 @@ "governance.referendums.search.empty" = "No referenda with entered title or ID\nwere found"; "governance.referendums.settings.title" = "Referenda"; "wallet.send.recipient.blocked.title" = "Recipient cannot accept transfer"; -"wallet.send.recipient.blocked.message" = "Recipient has been blocked by token owner and cannot currently accept incoming transfers"; \ No newline at end of file +"wallet.send.recipient.blocked.message" = "Recipient has been blocked by token owner and cannot currently accept incoming transfers";