From 0924e9b403498715a2940ec1718e2148ee44a9c8 Mon Sep 17 00:00:00 2001 From: ERussel Date: Mon, 29 May 2023 17:23:38 +0500 Subject: [PATCH 1/8] replace limited xcm transfers with unlimited --- .../Xcm/XcmTransferService+Compose.swift | 24 ++++--------------- .../Substrate/Calls/Xcm/XcmOrmlTransfer.swift | 14 +---------- .../Types/Xcm/Message/XcmWeightLimit.swift | 1 + 3 files changed, 6 insertions(+), 33 deletions(-) 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) From 84e934e9361abb2cd2fcd7f3c7164a4610a079f8 Mon Sep 17 00:00:00 2001 From: ERussel Date: Mon, 29 May 2023 17:50:26 +0500 Subject: [PATCH 2/8] use limited weight limit for fee calculation --- novawallet/Common/Model/Xcm/XcmTransferFactory.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From d60656a95f2dad28a5636cbc31c956b6b2df9921 Mon Sep 17 00:00:00 2001 From: ERussel Date: Mon, 29 May 2023 17:58:12 +0500 Subject: [PATCH 3/8] support Ledger for Astar --- novawallet/Common/Ledger/SupportedLedgerApps.swift | 3 ++- novawallet/Common/Model/KnownChainIds.swift | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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" From 543d56303b276e2feb4771c5c8f86ee96fee4cbe Mon Sep 17 00:00:00 2001 From: ERussel Date: Mon, 29 May 2023 18:31:03 +0500 Subject: [PATCH 4/8] move to v4 xcm --- novawallet/Common/Configs/ApplicationConfigs.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } From d134e69142b772819aa8d61dea83daa344fda074 Mon Sep 17 00:00:00 2001 From: ERussel Date: Tue, 30 May 2023 09:44:36 +0500 Subject: [PATCH 5/8] fix stash balance fetch --- .../Staking/ControllerAccount/ControllerAccountInteractor.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) From de26382738e2d2f44938bda79ce96045ab3f7017 Mon Sep 17 00:00:00 2001 From: ERussel Date: Tue, 30 May 2023 10:51:45 +0500 Subject: [PATCH 6/8] fix icons in settings --- .../iconApproveWithPin.imageset/Contents.json | 2 +- .../approve-with-pin.svg | 12 ------------ .../iconApproveWithPin.pdf | Bin 0 -> 4572 bytes .../iconBiometricAuth.imageset/Contents.json | 2 +- .../authentication.svg | 8 -------- .../iconBiometricAuth.pdf | Bin 0 -> 4110 bytes .../iconCurrency.imageset/Contents.json | 2 +- .../{Currency.pdf => iconCurrency.pdf} | Bin 3215 -> 3215 bytes .../iconEmail.imageset/Contents.json | 0 .../iconEmail.imageset/iconEmail.pdf | Bin 1862 -> 1862 bytes .../iconGithub.imageset/iconGithub.pdf | Bin 5057 -> 5057 bytes .../iconLanguage.imageset/iconLanguage.pdf | Bin 4776 -> 4775 bytes .../iconNetworks.imageset/Contents.json | 12 ------------ .../iconNetworks.imageset/iconNetworks.pdf | Bin 3259 -> 0 bytes .../iconPinCode.imageset/iconPinCode.pdf | Bin 7252 -> 0 bytes .../Contents.json | 2 +- .../iconPincode.imageset/iconPincode.pdf | Bin 0 -> 4112 bytes .../iconStar.imageset/iconStar.pdf | Bin 2129 -> 2129 bytes .../iconTelegram.imageset/iconTelegram.pdf | Bin 1720 -> 1720 bytes .../iconTerms.imageset/iconTerms.pdf | Bin 5431 -> 2771 bytes .../iconTwitter.imageset/iconTwitter.pdf | Bin 4117 -> 4117 bytes .../iconWallets.imageset/iconWallets.pdf | Bin 2957 -> 2957 bytes .../iconWebsite.imageset/iconWebsite.pdf | Bin 2795 -> 2795 bytes .../iconYoutube.imageset/Contents.json | 0 .../iconYoutube.imageset/iconYoutube.pdf | Bin 2126 -> 2126 bytes novawallet/en.lproj/Localizable.strings | 4 ++-- 26 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/approve-with-pin.svg create mode 100644 novawallet/Assets.xcassets/iconsSettings/iconApproveWithPin.imageset/iconApproveWithPin.pdf delete mode 100644 novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/authentication.svg create mode 100644 novawallet/Assets.xcassets/iconsSettings/iconBiometricAuth.imageset/iconBiometricAuth.pdf rename novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/{Currency.pdf => iconCurrency.pdf} (98%) rename novawallet/Assets.xcassets/{ => iconsSettings}/iconEmail.imageset/Contents.json (100%) rename novawallet/Assets.xcassets/{ => iconsSettings}/iconEmail.imageset/iconEmail.pdf (98%) delete mode 100644 novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/Contents.json delete mode 100644 novawallet/Assets.xcassets/iconsSettings/iconNetworks.imageset/iconNetworks.pdf delete mode 100644 novawallet/Assets.xcassets/iconsSettings/iconPinCode.imageset/iconPinCode.pdf rename novawallet/Assets.xcassets/iconsSettings/{iconPinCode.imageset => iconPincode.imageset}/Contents.json (76%) create mode 100644 novawallet/Assets.xcassets/iconsSettings/iconPincode.imageset/iconPincode.pdf rename novawallet/Assets.xcassets/{ => iconsSettings}/iconYoutube.imageset/Contents.json (100%) rename novawallet/Assets.xcassets/{ => iconsSettings}/iconYoutube.imageset/iconYoutube.pdf (98%) 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 0000000000000000000000000000000000000000..224cc1d2e36cbafc232591003206b17854aa68cd GIT binary patch literal 4572 zcmb7|U2hyU6o&8TSNJAUi&U>a#`ajMD$#@@1c;DwS8=gSrb$qC7k0O(^w;yA9nWhg zsi4e72o~xo?TwNd0}#N<8<}yYjys%{ck*Ue|A=z)1%BXc)=0hS+B#RS>vWN+BzFzhG?Hm z7zRaw!?=a!-dPj8vPQ>{hTN-7=d{DjgsFs152uOBTJ3Ugol_M#ZA3Du5u(dHjG|A; zW8R{T4pyr~BRq{hI+xUE0oF8s>E` zi`Q#A3_}>I_gJS>kkxyV#(OgQMNJJU_C&6fb zFQzS;oH3G7mSx)zmMs|-aKKmeo}|eZ8S_8|BvjC3i(WBX^qkX4WUZMd6jZ66O#@jy zOkV8(X0M{LIHn7rnEn=tKcGO4* zBm+eu8HMQ+2^EMVWecZ*W>8*nIwv=2BWnylc7+O>oYAXhP}0fiRQX`xSr^T^vyA9H zi-y`r8t=(yikce2HX&ni(|a}m?U6LgO~$lQ6A9ycu)Fia(lj|4)&9%JW~^HxKQ=V} z^wUDpG&xyGTXPg3;m56Ma(cxkr{@foM52EGRk!Va{?b#T!KYSwO~qyK--pCOyIIDD z<%_++_bWJuMpG5qrH!!{?1q)yNS!mzBf{`*eule1%9+u4m4#o1R%dY$KpL|d3`B1bkSGr&}y z{UX6ZW6ne)=b2KS(RO`M_j10NJ!8i1@c}=@)XRn?`V;bViaWOCai*IkmWz0~WiMB9 zxqZ)9b)UWEO&#r9Z}6+Hx7*$Epx*t88$F)YFMt0rsnzBBW-8#v>H2Q{diPPilYF0^ zI&l4h>S)n)H63;z_TzL=@|(d`QFp%E9;YoV$`1w$yj<_WR4AzVSwRqgZdiSPcMVsS zL~x}RJLkI(khM?zKY%ov;sZ?*;DH8f;OFb(`hIuwQ1s(|dfyq9x;cFLt6~V)|A5OQ z*E)IBmPj_r2MGH*Qt=4&Pi8rbVt+Wx - - - - - - - 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 0000000000000000000000000000000000000000..fdd571583c0bdbe748a157601a887ea225ed4878 GIT binary patch literal 4110 zcmcInO>Z1U5WUZ@=u4yoX?pwnLy961n;--Tv*8wTSjH2_$litB4GR2vUiI{JwPmCL zfjL;S&pp*$Rqs_*Ke@VmHEJ1$K?@}gKm9xi@%*`X@nV?w*YtBRJ-+#7-rt~b}48v-49A?qkYKu z)J5e}5^ddS+7Dh@pK^2}NTa;AS= z{xxKR&&dRnEw5UfFW;rCLx?pTKo$du{A;U<0jn(jSuM5bwf!104ey4x!+!Ywf6b%z z#bcxUL;_UKd(~x9I~nMS%h}0^9wIUnUm0|=hJ>xPSn{q7LOPSQE+jCmfd+Y0F(Bkd zM&)8uf}xH9+L6$0ekD}1QT}+X8kl2889oX^x6DoH= zHA0#Dcn6L$c@;DT6m`?0{XpIgL}qgK){88Scgm5>lL43Eb7|zdbo2_rV-#2yEM=;# zb5gq;bLplq25%AA3h}1+mQgEJiq4@B7JCLE9!oWkId&T}HVw-G;WC5Gi*d1Mm0+lO zOZsA8Ft1n>m8Ke}Fq0UiXnd$(mfo4HaT+B(0<0-8E7VzJ(15Q21yU4iI>#hN%nL?2 zqD>1SV~7J-k&}aMMiB?+qeGbmMiv!n1!LXT9lD$mQ^;b`qO&$nc&5VKYHbzx4(DKBWU z=)xE)e3?Qq)=^QhUQu;rEX&|sgl&A?qgjFEO5F7*#Y&^kJ0dO?AURNrmf2_*!BHzC zhD?K<7@USA(IS?T-eaNDm!&ubDAQyf;fUoDH;oJ6peT=NV0+=ajY)h z4MTFf6=1ih8F$y1LbS*?Nhi``U83!)%+|-44?x-}yG5@ArrENxb*ot+Zi^F?-s~?^J1f;WsiriTu2TyH7cKl*@-rXH; z9)9}aIKLgx2ZqIK`YVE`4hOhC&{}yD`vzeId2Nw M&hX^P7vH`56A3LjbN~PV literal 0 HcmV?d00001 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 59c0b89e23b07bb06ddeb74121375bf0cb167642..a5678e615dc8ed3ea9e5e603b76d9d9293a293ba 100644 GIT binary patch delta 43 mcmeB|?3bLdgxAp2%u>NX&&1ro)WTxp#xizPknJri>SQwxiY8>X=V0AOMVc>n+a delta 24 gcmX@ccZ_esVqQx_Gjjz4JyQ!K0|SGN8>X=V0AMx;Y5)KL diff --git a/novawallet/Assets.xcassets/iconsSettings/iconGithub.imageset/iconGithub.pdf b/novawallet/Assets.xcassets/iconsSettings/iconGithub.imageset/iconGithub.pdf index 7e66c9a72a4a57395b2493e514635deee5c983d2..ed062c604f63f26f59a4cf57b1c42d66587a68d4 100644 GIT binary patch delta 24 fcmX@8eo%eFVqQa2GfM>nJri>SQwxiY8w7;`V#^09 delta 24 fcmX@8eo%eFVqQx_Gjjz4JyQ!K0|SGN8w7;`VxI>Z diff --git a/novawallet/Assets.xcassets/iconsSettings/iconLanguage.imageset/iconLanguage.pdf b/novawallet/Assets.xcassets/iconsSettings/iconLanguage.imageset/iconLanguage.pdf index 9d88e2c8cd236bba65bde1ec3fd806d879a28498..bbe0ebb541d14e34f8b46847d86cc64699ed1cb6 100644 GIT binary patch literal 4775 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 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 e365e07e543d0d6c271af4e8b355f000a0b5ce9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3259 zcmZvfO^+Kl42JLe6}kjS3Pcw5Eg%Tc>^4Qw7Tr3%1wFX4lZ^|1w6;^E{q=o0o}rZN z`Vh=MBfTOilEXZ^yM6nTOje4t)yF^nR9e4!rC+~RI%^zJDIEl=H8`MXsx5(%o=~ba z>0oLI#Rom81`)lG9c!3cVm+7atupmQ6^7!y*<75yu84Od_yrOadk95@NAI2s~ZxQ`io9I9;c0 z_aHAtU5E$_*f(ds*veWn6OTk)q9YPQ2IUPQ#l3B@*)?{}|B@Uo01GKpU$`h-h>^1P z{E#Rx3cggTK*6ITDx>H@DzcjM!%>;m#gaoMtV=GIqL^A#ChdB|p{T zybu}JDDuK)A2|<;Nil>B%?@T1D;3mRg9#;wB!Of!(5{ISV?oK-h!SJ78$^{ympvaM za4JDmK-F@DlQtrzGz4E9lASElxzTI&RG*QHjk2v79RZ9BeLAHvuJo%p(3F*^n%VMe zg|kuK3i#2qw8=g}EKgO52v9X+|As}eI8D6;kweR@zIaYfGhlI+x2ryjL$ z3=NT-%~K;rXNd_d0FBvCWNsZoU<=ANz{9o*-ocR^Q*8_ZOXQHcqAo;Al(ptnQirT1 zEEF3vqO+*;tKc#`UThFDv^FPn%_W=kQLS z>y+_PlH05JJn7gC|Tj z0-=Y7X%kAaL9~cmEulBIBLs;l&=c5ae+Q=og>!O*#HE=c2zp|)Ko0ANZ`48ks(8+v zhsb5(44Mw}1Z{_3Cc(FwWrT@qW8`bNsB| zKk?CaVfhHRr$uQ!o{yhS!+6#_60c{uo8#d!9&jSh!wbCIoWL|@u?clkGb5R%S3hp= zVX9^i)_OVT=J*MF>5=_skWLA+U#G+lp5?&i_|4|B*&QFg-1_-6eo$6tbsaePU!7t^ zQUK3C!c4*MjF+2JX`t9RS~Mp!@nH)C_UOzwCLt?Jpc?|ymvKjVCsa{vGU 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 794ce6b88c17a0aa89cbda7414395d5fe1843dc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7252 zcmeHMO>f*b5WVYH@Dd;?5G{usegQ#%#%_wDE$VK13wqefisK^QZFe_C+F#!{lr$@Q zFE)BBv+wYAruU?tgubX~*E&n!dj<0^`w>QU+ z#sgf7)#14BH+RkIvj6M0>(}4DF&FRV|82rAR{G*Xs*T` zVtD9u*73toG~ljLD|Mia*`tT~bYa`i20U_i%gZMPn88YJo{qVv>N-KPpjuFFOv=i+RXCO1&;pxy35vSX_~A ztdCh-2C!1&L@8APrXRimUt{)X~rHSqpDYAzIWQp?;T{18x ziX-i7Rhq!Z43~dhYf)eX=H|=5Iwh0MZsXgJi3Sl zbSVEM8qHvo@*GjN)C%E2b?}95A|e&BGWh_uke0I$2oRYipiNlDh(Rq_^&=V>Ro@2Z z2pQWJqK8a@5Rv5!1S@*xGO!G;5FXYP<`AmLIR$8Y+Hi<2GG0UoFcKvXa`%Ztkq!x3 zfi7$d&M}~9fO8Bn8WD2}Ly!FlR0#ccSam(7Rh?CsB{KMM;H?cJccwh-T#%Qm^Ai&< zLcd)j(I8p4msv=*_JiRosmcc~YpR(24kM3L@gg`LI;2qR2c(_Q55jV#Kv2F`i<;L% z#r%imlk&2DF6$?xIooYMT}~7x6)oE_-F%G|TB@q>3x=2N*yFZiCppP}tbUt4em^$j zd-+(LzW(&vYgn@9vt5z@@5kayPs?(r)o7_tV`X{r;e(%w(z4nuY8sYyolH;PJgJ(N z#qP9KQa)8+%jW5Eo2QeUmbFgBv&iXet&S}Y-kHC-p_3h@(?u&Vk!;4xS<#1(eI6iMpp4R(SlCZhP#v=us}JCh%&r2WD^{Q=!>)mOy&Vwfg?{8lf7=U~Q&;E_R>sE}g}H z05bE0)1sLtN${W@o)W*<95lXtltMzVo gG?H*7c=hh~pB~ZI`@hZpSkp!>g zatrZN{;Vrmyt%~1_3*9I@B?_n`hm9-~^t_>v&y{d0jbuPGcVkjf*;x}E?AQs8$}9a7jQ91gc(vlqDKjtQtYX{AyClsxsk@Y5qx#}k zO`|%EH(!hjG$a1}>$}8wRc@pMKFD=lUaCjD30f{34t1+3Sw2%CwR&hPsnP1p!lhfN zrjw0X(TYqDuFBS6C>%79q81{F8o#U8rc|^$DA2F7P!A@SAJnf6GRQQ0lF4pR(}H2+ zi?S>4)#hpFV=HfgVFo+ZXP-C|A`xg{H#o!I!iJ#4)M*DniI^EG_MrU0D-+qiS8gP& z5A52qzLzc7(|fx#bew3lm8W=8uTOWR#D!8F+70&v$Jh05X{ztFd)apVc9ML~U^03A G@#+t?GAK9z literal 0 HcmV?d00001 diff --git a/novawallet/Assets.xcassets/iconsSettings/iconStar.imageset/iconStar.pdf b/novawallet/Assets.xcassets/iconsSettings/iconStar.imageset/iconStar.pdf index a10cbe97b6a4727e9a0472b23b92a1cb764d76f5..2a0bcd18694963af94cc7254e7406a19e73ba004 100644 GIT binary patch delta 46 zcmca8a8Y1Fud=BD5GWYxnV1?Hnj0x3=W-e785$Xynpr9s=$V)sm|9qD+^~=x03g&1 A0ssI2 delta 46 zcmca8a8Y1Fud<1yrHQeEp`MAUp`p2vLUJybfu5m}rJ*#RUS B3=04N diff --git a/novawallet/Assets.xcassets/iconsSettings/iconTelegram.imageset/iconTelegram.pdf b/novawallet/Assets.xcassets/iconsSettings/iconTelegram.imageset/iconTelegram.pdf index b04c77c31005373b110625d1646daefdda40e4b4..402bd669cf6845277ed15a02ba31c532526fe342 100644 GIT binary patch delta 46 zcmdnNyMuQ^ud=BD5GWYwnVTD0nj0%5=W-e785$Xynpr9s=$V)sm|9qD+`z#G02hM` AKL7v# delta 46 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 diff --git a/novawallet/Assets.xcassets/iconsSettings/iconTwitter.imageset/iconTwitter.pdf b/novawallet/Assets.xcassets/iconsSettings/iconTwitter.imageset/iconTwitter.pdf index 683a75607178521d2d4ca355bd4dfbe6ca48856b..01a0a5616fe9597b37ef17190256cfba8505715d 100644 GIT binary patch delta 24 fcmbQLFjZl~VqQa2GfM>nJri>SQwxiY8&dfJT2luT delta 24 fcmbQLFjZl~VqQx_Gjjz4JyQ!K0|SGN8&dfJS|NX&&1ro)WTxphPzwnJri>SQwxiY8xojMMK;SapJN9A9X<=+ delta 43 ncmaDY`dW0tVqQx_Gjjz4JyQ!K0|SGN8xojMMK;SapJN9A8@da@ 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 5dc746839670ecf9feed586c5742ba1ba1e75f21..0115e0c5889f787c3194441a44d2c2fdbb0e36fc 100644 GIT binary patch delta 24 gcmX>na86*tVqQa2GfM>nJri>SQwxiY8|JYC0Af1_mH+?% delta 24 gcmX>na86*tVqQx_Gjjz4JyQ!K0|SGN8|JYC0AddZhX4Qo 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"; From f9729130d95f6f11329bfe884523769549188f50 Mon Sep 17 00:00:00 2001 From: ERussel Date: Tue, 30 May 2023 11:19:00 +0500 Subject: [PATCH 7/8] fix colors in crowdloan --- .../CrowdloanContributionConfirmViewLayout.swift | 2 ++ .../CrowdloanContributionSetupViewLayout.swift | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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) From 3394735a284a6d01726081bbcda786501526edfc Mon Sep 17 00:00:00 2001 From: ERussel Date: Tue, 30 May 2023 12:08:18 +0500 Subject: [PATCH 8/8] fix icon naming --- novawallet/Modules/Settings/ViewModel/SettingsRow.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: