diff --git a/Cosmostation.xcodeproj/project.pbxproj b/Cosmostation.xcodeproj/project.pbxproj index e45fbb32a..55b0a19a3 100644 --- a/Cosmostation.xcodeproj/project.pbxproj +++ b/Cosmostation.xcodeproj/project.pbxproj @@ -238,8 +238,6 @@ 0438A7E32AE0E9FA006FA213 /* TxAmountLpSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0438A7E02AE0E9FA006FA213 /* TxAmountLpSheet.swift */; }; 0438A7E42AE0E9FA006FA213 /* TxAmountLpSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0438A7E12AE0E9FA006FA213 /* TxAmountLpSheet.xib */; }; 0438A7E52AE0E9FA006FA213 /* TxAmountLpSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0438A7E12AE0E9FA006FA213 /* TxAmountLpSheet.xib */; }; - 0438A7EE2AE123E7006FA213 /* basebg00.png in Resources */ = {isa = PBXBuildFile; fileRef = 0438A7EA2AE123E7006FA213 /* basebg00.png */; }; - 0438A7EF2AE123E7006FA213 /* basebg00.png in Resources */ = {isa = PBXBuildFile; fileRef = 0438A7EA2AE123E7006FA213 /* basebg00.png */; }; 0438A7F42AE1316B006FA213 /* KavaMintListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0438A7F22AE1316B006FA213 /* KavaMintListVC.swift */; }; 0438A7F52AE1316B006FA213 /* KavaMintListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0438A7F22AE1316B006FA213 /* KavaMintListVC.swift */; }; 0438A7F62AE1316B006FA213 /* KavaMintListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0438A7F32AE1316B006FA213 /* KavaMintListVC.xib */; }; @@ -955,6 +953,12 @@ 04E165BB28B61BE1000F12C0 /* MintscanAsset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E165B928B61BE1000F12C0 /* MintscanAsset.swift */; }; 04E165BD28B62133000F12C0 /* MintscanToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E165BC28B62133000F12C0 /* MintscanToken.swift */; }; 04E165BE28B62133000F12C0 /* MintscanToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E165BC28B62133000F12C0 /* MintscanToken.swift */; }; + 04E250DD2B8F0354007D5AA0 /* basebg00.png in Resources */ = {isa = PBXBuildFile; fileRef = 04E250DC2B8F0354007D5AA0 /* basebg00.png */; }; + 04E250DE2B8F0354007D5AA0 /* basebg00.png in Resources */ = {isa = PBXBuildFile; fileRef = 04E250DC2B8F0354007D5AA0 /* basebg00.png */; }; + 04E250E12B8F035E007D5AA0 /* basebg07.png in Resources */ = {isa = PBXBuildFile; fileRef = 04E250DF2B8F035E007D5AA0 /* basebg07.png */; }; + 04E250E22B8F035E007D5AA0 /* basebg07.png in Resources */ = {isa = PBXBuildFile; fileRef = 04E250DF2B8F035E007D5AA0 /* basebg07.png */; }; + 04E250E32B8F035E007D5AA0 /* basebg08.png in Resources */ = {isa = PBXBuildFile; fileRef = 04E250E02B8F035E007D5AA0 /* basebg08.png */; }; + 04E250E42B8F035E007D5AA0 /* basebg08.png in Resources */ = {isa = PBXBuildFile; fileRef = 04E250E02B8F035E007D5AA0 /* basebg08.png */; }; 04F048C72AF89B19002A809D /* SelectAddressBookCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F048C52AF89B19002A809D /* SelectAddressBookCell.swift */; }; 04F048C82AF89B19002A809D /* SelectAddressBookCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F048C52AF89B19002A809D /* SelectAddressBookCell.swift */; }; 04F048C92AF89B19002A809D /* SelectAddressBookCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 04F048C62AF89B19002A809D /* SelectAddressBookCell.xib */; }; @@ -1646,6 +1650,10 @@ E15980A72A83AC9E0032892B /* PortfolioVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15980A52A83AC9E0032892B /* PortfolioVC.swift */; }; E15980A92A83ADB60032892B /* MainTabVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15980A82A83ADB60032892B /* MainTabVC.swift */; }; E15980AA2A83ADB60032892B /* MainTabVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15980A82A83ADB60032892B /* MainTabVC.swift */; }; + E15A9B3C2B8CFA8C003A7CA4 /* ChainPolygon.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15A9B3B2B8CFA8C003A7CA4 /* ChainPolygon.swift */; }; + E15A9B3D2B8CFA8C003A7CA4 /* ChainPolygon.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15A9B3B2B8CFA8C003A7CA4 /* ChainPolygon.swift */; }; + E15A9B3F2B8CFAA3003A7CA4 /* ChainOptimism.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15A9B3E2B8CFAA3003A7CA4 /* ChainOptimism.swift */; }; + E15A9B402B8CFAA3003A7CA4 /* ChainOptimism.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15A9B3E2B8CFAA3003A7CA4 /* ChainOptimism.swift */; }; E15F2CFE2ABF0E6A00BAE105 /* CosmosStakingInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15F2CFC2ABF0E6A00BAE105 /* CosmosStakingInfoVC.swift */; }; E15F2CFF2ABF0E6A00BAE105 /* CosmosStakingInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15F2CFC2ABF0E6A00BAE105 /* CosmosStakingInfoVC.swift */; }; E15F2D002ABF0E6A00BAE105 /* CosmosStakingInfoVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E15F2CFD2ABF0E6A00BAE105 /* CosmosStakingInfoVC.xib */; }; @@ -1917,7 +1925,6 @@ 0437E086268C0A6700088391 /* RIPEMD160.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RIPEMD160.swift; sourceTree = ""; }; 0438A7E02AE0E9FA006FA213 /* TxAmountLpSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TxAmountLpSheet.swift; sourceTree = ""; }; 0438A7E12AE0E9FA006FA213 /* TxAmountLpSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TxAmountLpSheet.xib; sourceTree = ""; }; - 0438A7EA2AE123E7006FA213 /* basebg00.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = basebg00.png; sourceTree = ""; }; 0438A7F22AE1316B006FA213 /* KavaMintListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KavaMintListVC.swift; sourceTree = ""; }; 0438A7F32AE1316B006FA213 /* KavaMintListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KavaMintListVC.xib; sourceTree = ""; }; 0438A7F82AE135AF006FA213 /* kava_cdp_v1beta1_genesis.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = kava_cdp_v1beta1_genesis.pb.swift; sourceTree = ""; }; @@ -2272,6 +2279,9 @@ 04D279F82A69159E00AF046A /* BaseChain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseChain.swift; sourceTree = ""; }; 04E165B928B61BE1000F12C0 /* MintscanAsset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MintscanAsset.swift; sourceTree = ""; }; 04E165BC28B62133000F12C0 /* MintscanToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MintscanToken.swift; sourceTree = ""; }; + 04E250DC2B8F0354007D5AA0 /* basebg00.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = basebg00.png; sourceTree = ""; }; + 04E250DF2B8F035E007D5AA0 /* basebg07.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = basebg07.png; sourceTree = ""; }; + 04E250E02B8F035E007D5AA0 /* basebg08.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = basebg08.png; sourceTree = ""; }; 04F048C52AF89B19002A809D /* SelectAddressBookCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectAddressBookCell.swift; sourceTree = ""; }; 04F048C62AF89B19002A809D /* SelectAddressBookCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SelectAddressBookCell.xib; sourceTree = ""; }; 04F048CB2AF8D268002A809D /* CosmosCancelUnbonding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CosmosCancelUnbonding.swift; sourceTree = ""; }; @@ -2612,6 +2622,8 @@ E15980A22A83AB030032892B /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; E15980A52A83AC9E0032892B /* PortfolioVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortfolioVC.swift; sourceTree = ""; }; E15980A82A83ADB60032892B /* MainTabVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabVC.swift; sourceTree = ""; }; + E15A9B3B2B8CFA8C003A7CA4 /* ChainPolygon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChainPolygon.swift; sourceTree = ""; }; + E15A9B3E2B8CFAA3003A7CA4 /* ChainOptimism.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChainOptimism.swift; sourceTree = ""; }; E15F2CFC2ABF0E6A00BAE105 /* CosmosStakingInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CosmosStakingInfoVC.swift; sourceTree = ""; }; E15F2CFD2ABF0E6A00BAE105 /* CosmosStakingInfoVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CosmosStakingInfoVC.xib; sourceTree = ""; }; E15F2D022ABF105B00BAE105 /* StakeRewardAddressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StakeRewardAddressCell.swift; sourceTree = ""; }; @@ -2846,6 +2858,8 @@ 04C63D352B8762BF00D4A366 /* ChainHumansEVM.swift */, 042296832A890CC4003C7630 /* ChainKavaEVM.swift */, 04C63D2C2B87547400D4A366 /* ChainOktEVM.swift */, + E15A9B3E2B8CFAA3003A7CA4 /* ChainOptimism.swift */, + E15A9B3B2B8CFA8C003A7CA4 /* ChainPolygon.swift */, 04C63D3B2B8767A300D4A366 /* ChainXplaEVM.swift */, ); path = ClassEVM; @@ -2918,8 +2932,8 @@ 044ECB312A95E2160042DB3C /* ChainStargaze.swift */, 04B789E02ACAF6A900E9BE88 /* ChainStarname.swift */, 0402B84B2ACC868000824B3F /* ChainStride.swift */, - 0402B84E2ACC86B300824B3F /* ChainTerra.swift */, 0402B8512ACC875900824B3F /* ChainTeritori.swift */, + 0402B84E2ACC86B300824B3F /* ChainTerra.swift */, 044ECB342A95E2590042DB3C /* ChainUmee.swift */, 0402B8542ACC879A00824B3F /* ChainXpla.swift */, E17638512AA7642800904DB4 /* ChainBinanceBeacon.swift */, @@ -3951,13 +3965,15 @@ E1BBF7462ABEBE3000D3082F /* BgImg */ = { isa = PBXGroup; children = ( - 0438A7EA2AE123E7006FA213 /* basebg00.png */, + 04E250DC2B8F0354007D5AA0 /* basebg00.png */, 0472D4782B034E7200B9E6E8 /* basebg01.png */, 04C940CC2AEA56C200415256 /* basebg02.png */, 04C940CF2AEA56DE00415256 /* basebg03.png */, 04C940D22AEA56FC00415256 /* basebg04.png */, 04C940D82AEA579C00415256 /* basebg05.png */, 04F048D62AFCD34A002A809D /* basebg06.png */, + 04E250DF2B8F035E007D5AA0 /* basebg07.png */, + 04E250E02B8F035E007D5AA0 /* basebg08.png */, ); path = BgImg; sourceTree = ""; @@ -4165,6 +4181,7 @@ E1DBD3E12B620B760058E0DC /* EvmClass.storyboard in Resources */, E12E9D2D2AE2B4A700336449 /* KavaMintAction.xib in Resources */, 0443B89928589B570027A6B9 /* Color.xcassets in Resources */, + 04E250E42B8F035E007D5AA0 /* basebg08.png in Resources */, 04CD247F2AD308C800497EF5 /* SelectBepRecipientCell.xib in Resources */, 04CD244A2AD11D3400497EF5 /* LegacyTransfer.xib in Resources */, E131F4512AEEAAB800E760A0 /* CreateNameSheet.xib in Resources */, @@ -4182,7 +4199,6 @@ 04A68C322AC13A560041FA13 /* CosmosProposalsVC.xib in Resources */, 0400EEF62ADBEEF5007BA97F /* KavaLendListVC.xib in Resources */, 0400EEB22ADBB3C5007BA97F /* KavaDefiVC.xib in Resources */, - 0438A7EF2AE123E7006FA213 /* basebg00.png in Resources */, E16200352AF0CFFD0008F397 /* SelectEndpointCell.xib in Resources */, 047C10742AAC310600AFA159 /* QrAddressVC.xib in Resources */, 0409D2F82AC5DC6D0021E192 /* CosmosDelegate.xib in Resources */, @@ -4190,6 +4206,8 @@ E159805D2A6F5EFE0032892B /* PortfolioCell.xib in Resources */, 047BA8D22A94756A00D3F7DD /* CosmosClass.storyboard in Resources */, 0400EED12ADBBC43007BA97F /* KavaIncentiveCell.xib in Resources */, + 04E250DE2B8F0354007D5AA0 /* basebg00.png in Resources */, + 04E250E22B8F035E007D5AA0 /* basebg07.png in Resources */, 04C6B9C82AAC59EC00B02A95 /* QrAddressPopupVC.xib in Resources */, 04FF6B952B21E101009DCA89 /* CosmosRewardListPopupVC.xib in Resources */, 04527DC22A937CC1005F72D7 /* AssetCosmosClassCell.xib in Resources */, @@ -4365,6 +4383,7 @@ 0438A8202AE15283006FA213 /* KavaMintListCell.xib in Resources */, 0400EE8A2AD425F9007BA97F /* DappDetailVC.xib in Resources */, 04FC655E2B0C8E57008F2110 /* OkDeposit.xib in Resources */, + 04E250E12B8F035E007D5AA0 /* basebg07.png in Resources */, E16D9B192248C4880019B7BB /* Assets.xcassets in Resources */, 04C940E22AEB92F800415256 /* BaseImgSheetCell.xib in Resources */, 0402B7E82ACC132200824B3F /* CosmosCompounding.xib in Resources */, @@ -4379,6 +4398,7 @@ E1E0DBC82A9B0FE3006DA6BB /* HistoryCell.xib in Resources */, 04A1A8042AC80AA50014EF92 /* TxAmountSheet.xib in Resources */, 04CD248A2AD31E2000497EF5 /* BepTxResult.xib in Resources */, + 04E250E32B8F035E007D5AA0 /* basebg08.png in Resources */, 04B789ED2ACB336400E9BE88 /* SelectRefAddressCell.xib in Resources */, 04C63D122B836DD800D4A366 /* TxSendAddressSheet.xib in Resources */, 0400EF1F2ADC1D99007BA97F /* KavaLendAction.xib in Resources */, @@ -4419,7 +4439,6 @@ 0400EF192ADBF774007BA97F /* KavaLendListCell.xib in Resources */, E15980A32A83AB030032892B /* Main.storyboard in Resources */, 04A68C1F2ABDA3220041FA13 /* SelectSwapChainCell.xib in Resources */, - 0438A7EE2AE123E7006FA213 /* basebg00.png in Resources */, 0438A7E42AE0E9FA006FA213 /* TxAmountLpSheet.xib in Resources */, 047C10732AAC310600AFA159 /* QrAddressVC.xib in Resources */, 04BA9BD72A985771003E2404 /* ChainSelectVC.xib in Resources */, @@ -4452,6 +4471,7 @@ 04FEDB4E2B05D1340095B7B6 /* WalletDeriveVC.xib in Resources */, 047842DA2AC87C1000462F1C /* CosmosTxResult.xib in Resources */, 0438A7F62AE1316B006FA213 /* KavaMintListVC.xib in Resources */, + 04E250DD2B8F0354007D5AA0 /* basebg00.png in Resources */, E15F2D002ABF0E6A00BAE105 /* CosmosStakingInfoVC.xib in Resources */, 0400EEF52ADBEEF5007BA97F /* KavaLendListVC.xib in Resources */, 047842E62AC8B2D600462F1C /* CosmosRedelegate.xib in Resources */, @@ -4664,6 +4684,7 @@ 04CD24642AD2E2D500497EF5 /* Bep3Transfer.swift in Sources */, E122DC322A8A468E006D1E7B /* cosmos_nft_v1beta1_event.pb.swift in Sources */, 0402B8012ACC747A00824B3F /* ChainDesmos.swift in Sources */, + E15A9B3D2B8CFA8C003A7CA4 /* ChainPolygon.swift in Sources */, 0402B8472ACC85F300824B3F /* ChainSentinel.swift in Sources */, 04B789682ACAC9B100E9BE88 /* ibc_applications_fee_v1_query.pb.swift in Sources */, 047843C22AC991B300462F1C /* injective_wasmx_v1_genesis.pb.swift in Sources */, @@ -4871,6 +4892,7 @@ 04B789362ACAC9B100E9BE88 /* ibc_lightclients_localhost_v2_localhost.pb.swift in Sources */, 046EA8662AD04A2500A2FCE7 /* desmos_profiles_v3_query_dtag_requests.pb.swift in Sources */, E122DB602A8A468D006D1E7B /* cosmos_distribution_v1beta1_query.pb.swift in Sources */, + E15A9B402B8CFAA3003A7CA4 /* ChainOptimism.swift in Sources */, 04E165BE28B62133000F12C0 /* MintscanToken.swift in Sources */, 044ECB242A95DEB70042DB3C /* ChainLum880.swift in Sources */, E122DB782A8A468D006D1E7B /* cosmos_reflection_v1_reflection.grpc.swift in Sources */, @@ -5389,6 +5411,7 @@ 04CD24632AD2E2D500497EF5 /* Bep3Transfer.swift in Sources */, E122DC312A8A468E006D1E7B /* cosmos_nft_v1beta1_event.pb.swift in Sources */, 0402B8002ACC747A00824B3F /* ChainDesmos.swift in Sources */, + E15A9B3C2B8CFA8C003A7CA4 /* ChainPolygon.swift in Sources */, 0402B8462ACC85F300824B3F /* ChainSentinel.swift in Sources */, 04B789672ACAC9B100E9BE88 /* ibc_applications_fee_v1_query.pb.swift in Sources */, 047843C12AC991B300462F1C /* injective_wasmx_v1_genesis.pb.swift in Sources */, @@ -5596,6 +5619,7 @@ 047843E72AC991B300462F1C /* injective_insurance_v1beta1_query.pb.swift in Sources */, 04FA74752AA04417001A2830 /* SwitchAccountCell.swift in Sources */, 04B789352ACAC9B100E9BE88 /* ibc_lightclients_localhost_v2_localhost.pb.swift in Sources */, + E15A9B3F2B8CFAA3003A7CA4 /* ChainOptimism.swift in Sources */, 046EA8652AD04A2500A2FCE7 /* desmos_profiles_v3_query_dtag_requests.pb.swift in Sources */, E122DB5F2A8A468D006D1E7B /* cosmos_distribution_v1beta1_query.pb.swift in Sources */, 044ECB232A95DEB70042DB3C /* ChainLum880.swift in Sources */, @@ -6063,7 +6087,7 @@ CODE_SIGN_ENTITLEMENTS = Cosmostation/Cosmostation.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 259; + CURRENT_PROJECT_VERSION = 263; DEVELOPMENT_TEAM = 8G562MW56M; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -6075,7 +6099,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.10.3; + MARKETING_VERSION = 1.10.4; PRODUCT_BUNDLE_IDENTIFIER = io.wannabit.cosmostation.debug; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6096,7 +6120,7 @@ CODE_SIGN_ENTITLEMENTS = Cosmostation/Cosmostation.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 259; + CURRENT_PROJECT_VERSION = 263; DEVELOPMENT_TEAM = 8G562MW56M; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8G562MW56M; FRAMEWORK_SEARCH_PATHS = ( @@ -6109,7 +6133,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.10.3; + MARKETING_VERSION = 1.10.4; PRODUCT_BUNDLE_IDENTIFIER = io.wannabit.cosmostation.debug; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Cosmostation debug provisioning profile"; @@ -6249,7 +6273,7 @@ CODE_SIGN_ENTITLEMENTS = Cosmostation/Cosmostation.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 259; + CURRENT_PROJECT_VERSION = 263; DEVELOPMENT_TEAM = 8G562MW56M; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -6263,7 +6287,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.10.3; + MARKETING_VERSION = 1.10.4; PRODUCT_BUNDLE_IDENTIFIER = io.wannabit.cosmostation; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6282,7 +6306,7 @@ CODE_SIGN_ENTITLEMENTS = Cosmostation/Cosmostation.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 259; + CURRENT_PROJECT_VERSION = 263; DEVELOPMENT_TEAM = 8G562MW56M; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -6296,7 +6320,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.10.3; + MARKETING_VERSION = 1.10.4; PRODUCT_BUNDLE_IDENTIFIER = io.wannabit.cosmostation; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Cosmostation/Base/BaseConstant.swift b/Cosmostation/Base/BaseConstant.swift index 647c9dd43..850fd5aaa 100644 --- a/Cosmostation/Base/BaseConstant.swift +++ b/Cosmostation/Base/BaseConstant.swift @@ -697,7 +697,7 @@ public enum AutoPass: Int { } -let BASE_BG_IMG = ["basebg00", "basebg01", "basebg02", "basebg03", "basebg04", "basebg05", "basebg06"] +let BASE_BG_IMG = ["basebg00", "basebg01", "basebg02", "basebg03", "basebg04", "basebg05", "basebg06", "basebg07", "basebg08"] let QUOTES = ["quotes_01", "quotes_02", "quotes_03", "quotes_04", "quotes_05", "quotes_06", "quotes_07", "quotes_08", "quotes_09", "quotes_10", "quotes_11", "quotes_12", "quotes_13", "quotes_14", "quotes_15", "quotes_16", "quotes_17", "quotes_18", "quotes_19", "quotes_20", diff --git a/Cosmostation/Chains/ClassCosmos/CosmosClass.swift b/Cosmostation/Chains/ClassCosmos/CosmosClass.swift index 3f341439a..2015d2ad5 100644 --- a/Cosmostation/Chains/ClassCosmos/CosmosClass.swift +++ b/Cosmostation/Chains/ClassCosmos/CosmosClass.swift @@ -317,6 +317,7 @@ extension CosmosClass { func fetchChainParam2(_ group: DispatchGroup) { group.enter() +// print("fetchChainParam2 ", BaseNetWork.msChainParam(self)) AF.request(BaseNetWork.msChainParam(self), method: .get) .responseDecodable(of: JSON.self) { response in switch response.result { @@ -776,8 +777,8 @@ func ALLCOSMOSCLASS() -> [CosmosClass] { result.append(ChainStargaze()) // result.append(ChainStarname()) result.append(ChainStride()) - result.append(ChainTerra()) result.append(ChainTeritori()) + result.append(ChainTerra()) result.append(ChainUmee()) result.append(ChainXpla()) diff --git a/Cosmostation/Chains/ClassEVM/ChainAltheaEVM.swift b/Cosmostation/Chains/ClassEVM/ChainAltheaEVM.swift index 6f7ebc161..a529ba99c 100644 --- a/Cosmostation/Chains/ClassEVM/ChainAltheaEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainAltheaEVM.swift @@ -17,7 +17,7 @@ class ChainAltheaEVM: EvmClass { name = "Althea" tag = "althea60" - logo1 = "chainAlthea" + logo1 = "chainAltheaEvm" logo2 = "chainAlthea2" apiName = "althea" stakeDenom = "ualtg" diff --git a/Cosmostation/Chains/ClassEVM/ChainCantoEVM.swift b/Cosmostation/Chains/ClassEVM/ChainCantoEVM.swift index 64def50f9..2e8b718de 100644 --- a/Cosmostation/Chains/ClassEVM/ChainCantoEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainCantoEVM.swift @@ -17,7 +17,7 @@ class ChainCantoEVM: EvmClass { name = "Canto" tag = "canto60" - logo1 = "chainCanto" + logo1 = "chainCantoEvm" logo2 = "chainCanto2" apiName = "canto" stakeDenom = "acanto" diff --git a/Cosmostation/Chains/ClassEVM/ChainDymensionEVM.swift b/Cosmostation/Chains/ClassEVM/ChainDymensionEVM.swift index dc4785758..189626e96 100644 --- a/Cosmostation/Chains/ClassEVM/ChainDymensionEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainDymensionEVM.swift @@ -17,7 +17,7 @@ class ChainDymensionEVM: EvmClass { name = "Dymension" tag = "dymension60" - logo1 = "chainDymension" + logo1 = "chainDymensionEvm" logo2 = "chainDymension2" apiName = "dymension" stakeDenom = "adym" diff --git a/Cosmostation/Chains/ClassEVM/ChainEvmosEVM.swift b/Cosmostation/Chains/ClassEVM/ChainEvmosEVM.swift index 4f87d488b..4a5ff39f0 100644 --- a/Cosmostation/Chains/ClassEVM/ChainEvmosEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainEvmosEVM.swift @@ -17,7 +17,7 @@ class ChainEvmosEVM: EvmClass { name = "Evmos" tag = "evmos60" - logo1 = "chainEvmos" + logo1 = "chainEvmosEvm" logo2 = "chainEvmos2" apiName = "evmos" stakeDenom = "aevmos" diff --git a/Cosmostation/Chains/ClassEVM/ChainHumansEVM.swift b/Cosmostation/Chains/ClassEVM/ChainHumansEVM.swift index fe33e3a56..5676448ca 100644 --- a/Cosmostation/Chains/ClassEVM/ChainHumansEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainHumansEVM.swift @@ -17,7 +17,7 @@ class ChainHumansEVM: EvmClass { name = "Humans" tag = "humans60" - logo1 = "chainHumans" + logo1 = "chainHumansEvm" logo2 = "chainHumans2" apiName = "humans" stakeDenom = "aheart" diff --git a/Cosmostation/Chains/ClassEVM/ChainKavaEVM.swift b/Cosmostation/Chains/ClassEVM/ChainKavaEVM.swift index 929125831..bac3b0c40 100644 --- a/Cosmostation/Chains/ClassEVM/ChainKavaEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainKavaEVM.swift @@ -17,7 +17,7 @@ class ChainKavaEVM: EvmClass { name = "Kava" tag = "kava60" - logo1 = "chainKava" + logo1 = "chainKavaEvm" logo2 = "chainKava2" apiName = "kava" stakeDenom = "ukava" diff --git a/Cosmostation/Chains/ClassEVM/ChainOktEVM.swift b/Cosmostation/Chains/ClassEVM/ChainOktEVM.swift index c7272c0ea..81a5b8e76 100644 --- a/Cosmostation/Chains/ClassEVM/ChainOktEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainOktEVM.swift @@ -10,7 +10,7 @@ import Foundation import Alamofire import SwiftyJSON -class ChainOktEVM: EvmClass { +class ChainOktEVM: EvmClass { //For Legacy Lcd chains lazy var lcdNodeInfo = JSON() @@ -27,7 +27,7 @@ class ChainOktEVM: EvmClass { name = "OKT" tag = "okt60_Keccak" - logo1 = "chainOkt" + logo1 = "chainOktEvm" logo2 = "chainOkt2" apiName = "okc" stakeDenom = "okt" @@ -50,6 +50,7 @@ class ChainOktEVM: EvmClass { let group = DispatchGroup() fetchChainParam2(group) fetchErc20Info2(group) + fetchEvmBalance(group) fetchNodeInfo(group) fetchAccountInfo(group, bechAddress) diff --git a/Cosmostation/Chains/ClassEVM/ChainOptimism.swift b/Cosmostation/Chains/ClassEVM/ChainOptimism.swift new file mode 100644 index 000000000..c112e798f --- /dev/null +++ b/Cosmostation/Chains/ClassEVM/ChainOptimism.swift @@ -0,0 +1,35 @@ +// +// ChainOptimism.swift +// Cosmostation +// +// Created by yongjoo jung on 2024/02/27. +// Copyright © 2024 wannabit. All rights reserved. +// + +import Foundation + +class ChainOptimism: EvmClass { + + override init() { + super.init() + + name = "Optimism" + tag = "optimism60" + logo1 = "chainOptimism" + logo2 = "chainOptimism2" + apiName = "optimism" + + coinSymbol = "ETH" + coinGeckoId = "ethereum" + coinLogo = "tokenEth_Op" + + accountKeyType = AccountKeyType(.ETH_Keccak256, "m/44'/60'/0'/0/X") + + evmRpcURL = "https://mainnet.optimism.io" + explorerURL = "https://optimistic.etherscan.io/" + addressURL = explorerURL + "address/%@" + txURL = explorerURL + "tx/%@" + + } + +} diff --git a/Cosmostation/Chains/ClassEVM/ChainPolygon.swift b/Cosmostation/Chains/ClassEVM/ChainPolygon.swift new file mode 100644 index 000000000..ecc53a916 --- /dev/null +++ b/Cosmostation/Chains/ClassEVM/ChainPolygon.swift @@ -0,0 +1,35 @@ +// +// ChainPolygon.swift +// Cosmostation +// +// Created by yongjoo jung on 2024/02/27. +// Copyright © 2024 wannabit. All rights reserved. +// + +import Foundation + +class ChainPolygon: EvmClass { + + override init() { + super.init() + + name = "Polygon" + tag = "polygon60" + logo1 = "chainPolygon" + logo2 = "chainPolygon2" + apiName = "polygon" + + coinSymbol = "MATIC" + coinGeckoId = "matic-network" + coinLogo = "tokenMatic" + + accountKeyType = AccountKeyType(.ETH_Keccak256, "m/44'/60'/0'/0/X") + + evmRpcURL = "https://polygon-rpc.com" + explorerURL = "https://polygonscan.com/" + addressURL = explorerURL + "address/%@" + txURL = explorerURL + "tx/%@" + + } + +} diff --git a/Cosmostation/Chains/ClassEVM/ChainXplaEVM.swift b/Cosmostation/Chains/ClassEVM/ChainXplaEVM.swift index 62ae2912f..f204599da 100644 --- a/Cosmostation/Chains/ClassEVM/ChainXplaEVM.swift +++ b/Cosmostation/Chains/ClassEVM/ChainXplaEVM.swift @@ -17,7 +17,7 @@ class ChainXplaEVM: EvmClass { name = "Xpla" tag = "xplaKeccak256" - logo1 = "chainXpla" + logo1 = "chainXplaEvm" logo2 = "chainXpla2" apiName = "xpla" stakeDenom = "axpla" diff --git a/Cosmostation/Chains/ClassEVM/EvmClass.swift b/Cosmostation/Chains/ClassEVM/EvmClass.swift index 6fb2ab071..5d9261c66 100644 --- a/Cosmostation/Chains/ClassEVM/EvmClass.swift +++ b/Cosmostation/Chains/ClassEVM/EvmClass.swift @@ -62,7 +62,6 @@ class EvmClass: CosmosClass { if (supportCosmos) { let channel = getConnection() fetchAuth(group, channel) - group.notify(queue: .main) { try? channel.close() WUtils.onParseVestingAccount(self) @@ -99,7 +98,7 @@ class EvmClass: CosmosClass { //Do not using Task, only DispatchQueue : make slow DispatchQueue.global().async { if let balance = try? self.getWeb3Connection()?.eth.getBalance(address: EthereumAddress.init(self.evmAddress)!) { - self.evmBalances = NSDecimalNumber(string: String(balance!)) + self.evmBalances = NSDecimalNumber(string: String(balance ?? "0")) } DispatchQueue.main.async(execute: { self.fetched = true @@ -161,10 +160,12 @@ class EvmClass: CosmosClass { extension EvmClass { func fetchErc20Info() async throws -> [MintscanToken] { +// print("fetchErc20Info ", BaseNetWork.msErc20InfoUrl(self)) return try await AF.request(BaseNetWork.msErc20InfoUrl(self), method: .get).serializingDecodable([MintscanToken].self).value } func fetchErc20Info2(_ group: DispatchGroup) { +// print("fetchErc20Info2 ", BaseNetWork.msErc20InfoUrl(self)) group.enter() AF.request(BaseNetWork.msErc20InfoUrl(self), method: .get) .responseDecodable(of: [MintscanToken].self) { response in @@ -179,14 +180,10 @@ extension EvmClass { } func fetchEvmBalance(_ group: DispatchGroup) { - print("fetchEvmBalance START", self.tag) - group.enter() - Task.detached(priority: .high) { + DispatchQueue(label: "evmBalance", attributes: .concurrent).async(group: group) { if let balance = try? self.getWeb3Connection()?.eth.getBalance(address: EthereumAddress.init(self.evmAddress)!) { - self.evmBalances = NSDecimalNumber(string: String(balance!)) - print("fetchEvmBalance DONE", self.tag) + self.evmBalances = NSDecimalNumber(string: String(balance ?? "0")) } - group.leave() } } } @@ -195,7 +192,7 @@ extension EvmClass { func fetchAllErc20Balance(_ id: Int64) { let group = DispatchGroup() mintscanErc20Tokens.forEach { token in - if (tag != "ethereum60" || token.isdefault == true) { + if (supportCosmos || token.isdefault == true) { fetchErc20Balance(group, EthereumAddress.init(evmAddress)!, token) } } @@ -237,6 +234,8 @@ func ALLEVMCLASS() -> [EvmClass] { result.append(ChainHumansEVM()) result.append(ChainKavaEVM()) result.append(ChainOktEVM()) + result.append(ChainOptimism()) + result.append(ChainPolygon()) result.append(ChainXplaEVM()) //Add cosmos chain id for ibc @@ -248,6 +247,6 @@ func ALLEVMCLASS() -> [EvmClass] { return result } -let DEFUAL_DISPALY_EVM = ["ethereum60", "Dymension60", "kava60"] +let DEFUAL_DISPALY_EVM = ["ethereum60", "dymension60", "kava60"] let EVM_BASE_FEE = NSDecimalNumber.init(string: "588000000000000") diff --git a/Cosmostation/Controller/Main/CosmosClass/CosmosClassVC.swift b/Cosmostation/Controller/Main/CosmosClass/CosmosClassVC.swift index 3b086a174..bf6a8c399 100644 --- a/Cosmostation/Controller/Main/CosmosClass/CosmosClassVC.swift +++ b/Cosmostation/Controller/Main/CosmosClass/CosmosClassVC.swift @@ -179,6 +179,15 @@ class CosmosClassVC: BaseVC { transfer.modalTransitionStyle = .coverVertical self.present(transfer, animated: true) + } else if (selectedChain is ChainOktEVM) { + let transfer = CommonTransfer(nibName: "CommonTransfer", bundle: nil) + transfer.sendType = .Only_EVM_Coin + transfer.fromChain = selectedChain + transfer.toSendDenom = selectedChain.stakeDenom + transfer.toSendMsAsset = BaseData.instance.getAsset(selectedChain.apiName, selectedChain.stakeDenom) + transfer.modalTransitionStyle = .coverVertical + self.present(transfer, animated: true) + } else { let transfer = CommonTransfer(nibName: "CommonTransfer", bundle: nil) transfer.sendType = (selectedChain is EvmClass) ? .CosmosEVM_Coin : .Only_Cosmos_Coin diff --git a/Cosmostation/Controller/Main/CosmosClass/CosmosCoinVC.swift b/Cosmostation/Controller/Main/CosmosClass/CosmosCoinVC.swift index 378500863..39f8eac2c 100644 --- a/Cosmostation/Controller/Main/CosmosClass/CosmosCoinVC.swift +++ b/Cosmostation/Controller/Main/CosmosClass/CosmosCoinVC.swift @@ -329,7 +329,8 @@ extension CosmosCoinVC: UITableViewDelegate, UITableViewDataSource { } else if (selectedChain is ChainOktEVM) { if (indexPath.section == 0) { if (indexPath.row == 0) { - onStartTransferVC(.CosmosEVM_Coin, lcdBalances[indexPath.row]["denom"].stringValue) + //OKT EVM only support Ox style + onStartTransferVC(.Only_EVM_Coin, lcdBalances[indexPath.row]["denom"].stringValue) } else { onStartLegacyTransferVC(lcdBalances[indexPath.row]["denom"].stringValue) } diff --git a/Cosmostation/Controller/Main/CosmosClass/GenTx/CosmosTxResult.swift b/Cosmostation/Controller/Main/CosmosClass/GenTx/CosmosTxResult.swift index 67aa46d3c..21af94b15 100644 --- a/Cosmostation/Controller/Main/CosmosClass/GenTx/CosmosTxResult.swift +++ b/Cosmostation/Controller/Main/CosmosClass/GenTx/CosmosTxResult.swift @@ -26,11 +26,8 @@ class CosmosTxResult: BaseVC { @IBOutlet weak var quotesLayer: UIView! @IBOutlet weak var quotesMsgLabel: UILabel! @IBOutlet weak var quotoesAutherLabel: UILabel! - @IBOutlet weak var loadingView: LottieAnimationView! - var resultType: TxResultType = .Cosmos - var selectedChain: CosmosClass! var broadcastTxResponse: Cosmos_Base_Abci_V1beta1_TxResponse? var txResponse: Cosmos_Tx_V1beta1_GetTxResponse? @@ -54,99 +51,74 @@ class CosmosTxResult: BaseVC { loadingView.play() confirmBtn.isEnabled = false - if (resultType == .Cosmos) { - if (selectedChain is ChainBinanceBeacon) { - successMintscanBtn.setTitle("Check in Explorer", for: .normal) - failMintscanBtn.setTitle("Check in Explorer", for: .normal) - guard legacyResult != nil else { - loadingView.isHidden = true - failView.isHidden = false - confirmBtn.isEnabled = true - return - } - - if (legacyResult["code"].intValue != 0) { - loadingView.isHidden = true - failView.isHidden = false - failMsgLabel.text = legacyResult?["log"].stringValue - confirmBtn.isEnabled = true - return - } else { - loadingView.isHidden = true - successView.isHidden = false - confirmBtn.isEnabled = true - } - - } else if (selectedChain is ChainOktEVM || selectedChain is ChainOkt996Keccak) { - successMintscanBtn.setTitle("Check in Explorer", for: .normal) - failMintscanBtn.setTitle("Check in Explorer", for: .normal) - guard legacyResult != nil else { - loadingView.isHidden = true - failView.isHidden = false - confirmBtn.isEnabled = true - return - } - - if (legacyResult["code"].int != nil) { - loadingView.isHidden = true - failView.isHidden = false - failMsgLabel.text = legacyResult?["raw_log"].stringValue - confirmBtn.isEnabled = true - - } else { - loadingView.isHidden = true - successView.isHidden = false - confirmBtn.isEnabled = true - } - - + if (selectedChain is ChainBinanceBeacon) { + successMintscanBtn.setTitle("Check in Explorer", for: .normal) + failMintscanBtn.setTitle("Check in Explorer", for: .normal) + guard legacyResult != nil else { + loadingView.isHidden = true + failView.isHidden = false + confirmBtn.isEnabled = true + return + } + + if (legacyResult["code"].intValue != 0) { + loadingView.isHidden = true + failView.isHidden = false + failMsgLabel.text = legacyResult?["log"].stringValue + confirmBtn.isEnabled = true + return } else { - guard (broadcastTxResponse?.txhash) != nil else { - loadingView.isHidden = true - failView.isHidden = false - failMsgLabel.text = broadcastTxResponse?.rawLog - confirmBtn.isEnabled = true - return - } - setQutoes() - fetchTx() + loadingView.isHidden = true + successView.isHidden = false + confirmBtn.isEnabled = true } - } else { - guard evmHash != nil else { + } else if (selectedChain is ChainOktEVM || selectedChain is ChainOkt996Keccak) { + successMintscanBtn.setTitle("Check in Explorer", for: .normal) + failMintscanBtn.setTitle("Check in Explorer", for: .normal) + guard legacyResult != nil else { loadingView.isHidden = true failView.isHidden = false - failMsgLabel.text = "" confirmBtn.isEnabled = true return } - fetchEvmTx() - } - } - - func onUpdateView() { - if (resultType == .Cosmos) { - loadingView.isHidden = true - confirmBtn.isEnabled = true - if (txResponse?.txResponse.code != 0) { + + if (legacyResult["code"].int != nil) { + loadingView.isHidden = true failView.isHidden = false - failMintscanBtn.isHidden = false - failMsgLabel.text = txResponse?.txResponse.rawLog + failMsgLabel.text = legacyResult?["raw_log"].stringValue + confirmBtn.isEnabled = true } else { + loadingView.isHidden = true successView.isHidden = false + confirmBtn.isEnabled = true } + } else { - loadingView.isHidden = true - confirmBtn.isEnabled = true - if (evmRecipient!.status != .ok) { + guard (broadcastTxResponse?.txhash) != nil else { + loadingView.isHidden = true failView.isHidden = false - failMintscanBtn.isHidden = false - failMsgLabel.text = evmRecipient?.logsBloom.debugDescription - } else { - successView.isHidden = false + failMsgLabel.text = broadcastTxResponse?.rawLog + confirmBtn.isEnabled = true + return } + setQutoes() + fetchTx() + } + } + + func onUpdateView() { + loadingView.isHidden = true + confirmBtn.isEnabled = true + if (txResponse?.txResponse.code != 0) { + failView.isHidden = false + failMintscanBtn.isHidden = false + failMsgLabel.text = txResponse?.txResponse.rawLog + + } else { + successView.isHidden = false } } @@ -177,35 +149,6 @@ class CosmosTxResult: BaseVC { } } - func fetchEvmTx() { -// Task { -// guard let url = URL(string: selectedChain.rpcURL) else { return } -// guard let web3 = try? Web3.new(url) else { return } -// -// do { -// let receiptTx = try web3.eth.getTransactionReceipt(evmHash!) -// self.evmRecipient = receiptTx -// DispatchQueue.main.async { -// self.onUpdateView() -// } -// -// } catch { -// self.confirmBtn.isEnabled = true -// self.fetchCnt = self.fetchCnt - 1 -// if (self.fetchCnt > 0) { -// DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(6000), execute: { -// self.fetchEvmTx() -// }); -// -// } else { -// DispatchQueue.main.async { -// self.onShowMoreWait() -// } -// } -// } -// } - } - func onShowMoreWait() { let noticeAlert = UIAlertController(title: NSLocalizedString("more_wait_title", comment: ""), message: NSLocalizedString("more_wait_msg", comment: ""), preferredStyle: .alert) noticeAlert.addAction(UIAlertAction(title: NSLocalizedString("close", comment: ""), style: .default, handler: { _ in @@ -213,11 +156,7 @@ class CosmosTxResult: BaseVC { })) noticeAlert.addAction(UIAlertAction(title: NSLocalizedString("wait", comment: ""), style: .default, handler: { _ in self.fetchCnt = 10 - if (self.resultType == .Cosmos) { - self.fetchTx() - } else { - self.fetchEvmTx() - } + self.fetchTx() })) self.present(noticeAlert, animated: true) } @@ -231,21 +170,16 @@ class CosmosTxResult: BaseVC { } @IBAction func onClickExplorer(_ sender: UIButton) { - if (self.resultType == .Cosmos) { - if (selectedChain is ChainBinanceBeacon) { - guard let url = BaseNetWork.getTxDetailUrl(selectedChain, legacyResult!["hash"].stringValue) else { return } - self.onShowSafariWeb(url) - - } else if (selectedChain is ChainOktEVM || selectedChain is ChainOkt996Keccak) { - guard let url = BaseNetWork.getTxDetailUrl(selectedChain, legacyResult!["txhash"].stringValue) else { return } - self.onShowSafariWeb(url) - - } else { - guard let url = BaseNetWork.getTxDetailUrl(selectedChain, broadcastTxResponse!.txhash) else { return } - self.onShowSafariWeb(url) - } + if (selectedChain is ChainBinanceBeacon) { + guard let url = BaseNetWork.getTxDetailUrl(selectedChain, legacyResult!["hash"].stringValue) else { return } + self.onShowSafariWeb(url) + + } else if (selectedChain is ChainOktEVM || selectedChain is ChainOkt996Keccak) { + guard let url = BaseNetWork.getTxDetailUrl(selectedChain, legacyResult!["txhash"].stringValue) else { return } + self.onShowSafariWeb(url) + } else { - guard let url = BaseNetWork.getTxDetailUrl(selectedChain, evmHash!) else { return } + guard let url = BaseNetWork.getTxDetailUrl(selectedChain, broadcastTxResponse!.txhash) else { return } self.onShowSafariWeb(url) } } @@ -284,9 +218,3 @@ extension CosmosTxResult { } } - - -public enum TxResultType: Int { - case Cosmos = 0 - case Evm = 1 -} diff --git a/Cosmostation/Controller/Main/GenTx/CommonTransferResult.swift b/Cosmostation/Controller/Main/GenTx/CommonTransferResult.swift index 28932e7a9..2d85e242e 100644 --- a/Cosmostation/Controller/Main/GenTx/CommonTransferResult.swift +++ b/Cosmostation/Controller/Main/GenTx/CommonTransferResult.swift @@ -19,6 +19,7 @@ class CommonTransferResult: BaseVC, AddressBookDelegate { @IBOutlet weak var resultTitle: UILabel! @IBOutlet weak var successView: UIView! @IBOutlet weak var successExplorerBtn: UIButton! + @IBOutlet weak var successMsgLabel: UILabel! @IBOutlet weak var failView: UIView! @IBOutlet weak var failMsgLabel: UILabel! @IBOutlet weak var failExplorerBtn: UIButton! @@ -81,10 +82,12 @@ class CommonTransferResult: BaseVC, AddressBookDelegate { resultTitle.text = NSLocalizedString("str_tx_result", comment: "") confirmBtn.setTitle(NSLocalizedString("str_confirm", comment: ""), for: .normal) if (txStyle == .WEB3_STYLE) { + successMsgLabel.text = "The transaction is completed You can view details on Explorer." successExplorerBtn.setTitle("Check in Explorer", for: .normal) failExplorerBtn.setTitle("Check in Explorer", for: .normal) } else if (txStyle == .COSMOS_STYLE) { + successMsgLabel.text = "The transaction is completed You can view details on Mintscan." successExplorerBtn.setTitle("Check in Mintscan", for: .normal) failExplorerBtn.setTitle("Check in Mintscan", for: .normal) } @@ -210,7 +213,7 @@ extension CommonTransferResult { } func fetchEvmTx() { - Task { + DispatchQueue.global().async { [self] in let web3 = (fromChain as! EvmClass).getWeb3Connection()! do { let receiptTx = try web3.eth.getTransactionReceipt(evmHash!) @@ -220,7 +223,9 @@ extension CommonTransferResult { } } catch { - self.confirmBtn.isEnabled = true + DispatchQueue.main.async { + self.confirmBtn.isEnabled = true + } self.fetchCnt = self.fetchCnt - 1 if (self.fetchCnt > 0) { DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(6000), execute: { @@ -245,7 +250,7 @@ extension CommonTransferResult { noticeAlert.addAction(UIAlertAction(title: NSLocalizedString("wait", comment: ""), style: .default, handler: { _ in self.fetchCnt = 10 if (self.txStyle == .WEB3_STYLE) { - + self.fetchEvmTx() } else if (self.txStyle == .COSMOS_STYLE) { self.fetchCosmosTx() } diff --git a/Cosmostation/Controller/Main/GenTx/CommonTransferResult.xib b/Cosmostation/Controller/Main/GenTx/CommonTransferResult.xib index 9f3daed1f..d770526cf 100644 --- a/Cosmostation/Controller/Main/GenTx/CommonTransferResult.xib +++ b/Cosmostation/Controller/Main/GenTx/CommonTransferResult.xib @@ -26,6 +26,7 @@ + diff --git a/Cosmostation/Controller/Main/MainTabVC.swift b/Cosmostation/Controller/Main/MainTabVC.swift index c0c937f60..29cc28fb2 100644 --- a/Cosmostation/Controller/Main/MainTabVC.swift +++ b/Cosmostation/Controller/Main/MainTabVC.swift @@ -47,7 +47,7 @@ class MainTabVC: UITabBarController, UITabBarControllerDelegate { view.insertSubview(chainImg!, at: 1) UIView.animate(withDuration: 3, animations: { - self.chainImg?.alpha = 0.05 + self.chainImg?.alpha = 0.1 self.chainImg?.transform = CGAffineTransform(scaleX: 1.05, y: 1.05) }) } diff --git a/Cosmostation/Controller/Main/QrAddressPopup2VC.swift b/Cosmostation/Controller/Main/QrAddressPopup2VC.swift index 14fd83e6a..63dd77460 100644 --- a/Cosmostation/Controller/Main/QrAddressPopup2VC.swift +++ b/Cosmostation/Controller/Main/QrAddressPopup2VC.swift @@ -39,7 +39,7 @@ class QrAddressPopup2VC: BaseVC { } if let selectedChain = selectedChain as? EvmClass { - evmCompatTag.isHidden = false +// cosmosTag.isHidden = false evmAddress = selectedChain.evmAddress bechAddress = selectedChain.bechAddress diff --git a/Cosmostation/Controller/Main/QrAddressVC.swift b/Cosmostation/Controller/Main/QrAddressVC.swift index 6747f8d52..c94aa5a40 100644 --- a/Cosmostation/Controller/Main/QrAddressVC.swift +++ b/Cosmostation/Controller/Main/QrAddressVC.swift @@ -34,7 +34,7 @@ class QrAddressVC: BaseVC { if let evmChain = selectedChain as? EvmClass { addressToggleBtn.isHidden = !evmChain.supportCosmos - cosmosTag.isHidden = !evmChain.supportCosmos +// cosmosTag.isHidden = !evmChain.supportCosmos toDpAddress = evmChain.evmAddress addressLabel.text = toDpAddress addressLabel.adjustsFontSizeToFitWidth = true diff --git a/Cosmostation/Controller/Sheet/SelectAddressListSheet.swift b/Cosmostation/Controller/Sheet/SelectAddressListSheet.swift index 4b90ac840..539f414de 100644 --- a/Cosmostation/Controller/Sheet/SelectAddressListSheet.swift +++ b/Cosmostation/Controller/Sheet/SelectAddressListSheet.swift @@ -47,7 +47,7 @@ class SelectAddressListSheet: BaseVC { } } BaseData.instance.selectAllAddressBooks().forEach { book in - if (book.chainName == toChain.name && book.dpAddress.starts(with: "0x") && book.dpAddress != senderEvmAddress) { + if (book.dpAddress.starts(with: "0x") && book.dpAddress != senderEvmAddress) { evmAddressBook.append(book) } } @@ -63,7 +63,7 @@ class SelectAddressListSheet: BaseVC { } BaseData.instance.selectAllAddressBooks().forEach { book in - if (book.chainName == toChain.name && book.dpAddress != senderBechAddress) { + if (book.chainName == toChain.name && !book.dpAddress.starts(with: "0x") && book.dpAddress != senderBechAddress) { bechAddressBook.append(book) } } @@ -78,7 +78,7 @@ class SelectAddressListSheet: BaseVC { } } BaseData.instance.selectAllAddressBooks().forEach { book in - if (book.chainName == toChain.name && book.dpAddress != senderBechAddress) { + if (book.chainName == toChain.name && !book.dpAddress.starts(with: "0x") && book.dpAddress != senderBechAddress) { bechAddressBook.append(book) } } @@ -91,7 +91,7 @@ class SelectAddressListSheet: BaseVC { } } BaseData.instance.selectAllAddressBooks().forEach { book in - if (book.chainName == toChain.name && book.dpAddress.starts(with: "0x") && book.dpAddress != senderEvmAddress) { + if (book.dpAddress.starts(with: "0x") && book.dpAddress != senderEvmAddress) { evmAddressBook.append(book) } } diff --git a/Cosmostation/Controller/Sheet/SheetCell/SelectRefAddressCell.swift b/Cosmostation/Controller/Sheet/SheetCell/SelectRefAddressCell.swift index 05cf2ad14..9b9848d02 100644 --- a/Cosmostation/Controller/Sheet/SheetCell/SelectRefAddressCell.swift +++ b/Cosmostation/Controller/Sheet/SheetCell/SelectRefAddressCell.swift @@ -49,10 +49,10 @@ class SelectRefAddressCell: UITableViewCell { keyTypeTag.isHidden = false } } - let allEvm = ALLEVMCLASS() - if (allEvm.filter({ $0.tag == refAddress.chainTag }).count != 0) { - evmCompatTag.isHidden = false - } +// let allEvm = ALLEVMCLASS() +// if (allEvm.filter({ $0.tag == refAddress.chainTag }).count != 0) { +// evmCompatTag.isHidden = false +// } addressLabel.text = refAddress.bechAddress addressLabel.adjustsFontSizeToFitWidth = true diff --git a/Cosmostation/Controller/Sheet/TxSendAmountSheet.swift b/Cosmostation/Controller/Sheet/TxSendAmountSheet.swift index b25effc7f..04f89b5ac 100644 --- a/Cosmostation/Controller/Sheet/TxSendAmountSheet.swift +++ b/Cosmostation/Controller/Sheet/TxSendAmountSheet.swift @@ -50,8 +50,8 @@ class TxSendAmountSheet: BaseVC, UITextFieldDelegate { } func onInitView() { - if let existedAmount = existedAmount { - amountTextField.text = existedAmount.multiplying(byPowerOf10: -decimal, withBehavior: getDivideHandler(decimal)).stringValue + if (existedAmount != nil && existedAmount != NSDecimalNumber.zero) { + amountTextField.text = existedAmount!.multiplying(byPowerOf10: -decimal, withBehavior: getDivideHandler(decimal)).stringValue } if (sendType == .Only_Cosmos_CW20 || sendType == .Only_EVM_ERC20) { diff --git a/Cosmostation/Resource/BgImg/basebg00.png b/Cosmostation/Resource/BgImg/basebg00.png index b18d0a728..768db7280 100644 Binary files a/Cosmostation/Resource/BgImg/basebg00.png and b/Cosmostation/Resource/BgImg/basebg00.png differ diff --git a/Cosmostation/Resource/BgImg/basebg07.png b/Cosmostation/Resource/BgImg/basebg07.png new file mode 100644 index 000000000..34475baea Binary files /dev/null and b/Cosmostation/Resource/BgImg/basebg07.png differ diff --git a/Cosmostation/Resource/BgImg/basebg08.png b/Cosmostation/Resource/BgImg/basebg08.png new file mode 100644 index 000000000..a7152192a Binary files /dev/null and b/Cosmostation/Resource/BgImg/basebg08.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainAltheaEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainAltheaEvm.imageset/Contents.json new file mode 100644 index 000000000..fc606bb6f --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainAltheaEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "althea_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainAltheaEvm.imageset/althea_evm.png b/Cosmostation/Resource/Chain.xcassets/chainAltheaEvm.imageset/althea_evm.png new file mode 100644 index 000000000..205e7306b Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainAltheaEvm.imageset/althea_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainCantoEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainCantoEvm.imageset/Contents.json new file mode 100644 index 000000000..e6ed14e3b --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainCantoEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "canto_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainCantoEvm.imageset/canto_evm.png b/Cosmostation/Resource/Chain.xcassets/chainCantoEvm.imageset/canto_evm.png new file mode 100644 index 000000000..ea485edad Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainCantoEvm.imageset/canto_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainDymensionEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainDymensionEvm.imageset/Contents.json new file mode 100644 index 000000000..0833f57cb --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainDymensionEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "dymension_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainDymensionEvm.imageset/dymension_evm.png b/Cosmostation/Resource/Chain.xcassets/chainDymensionEvm.imageset/dymension_evm.png new file mode 100644 index 000000000..10e8003d4 Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainDymensionEvm.imageset/dymension_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainEvmosEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainEvmosEvm.imageset/Contents.json new file mode 100644 index 000000000..81bbab9a0 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainEvmosEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "evmos_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainEvmosEvm.imageset/evmos_evm.png b/Cosmostation/Resource/Chain.xcassets/chainEvmosEvm.imageset/evmos_evm.png new file mode 100644 index 000000000..c4a99ac75 Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainEvmosEvm.imageset/evmos_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainHumansEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainHumansEvm.imageset/Contents.json new file mode 100644 index 000000000..7c062ec8d --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainHumansEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "humans_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainHumansEvm.imageset/humans_evm.png b/Cosmostation/Resource/Chain.xcassets/chainHumansEvm.imageset/humans_evm.png new file mode 100644 index 000000000..593b3da9e Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainHumansEvm.imageset/humans_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainKavaEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainKavaEvm.imageset/Contents.json new file mode 100644 index 000000000..c58e36536 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainKavaEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "kava_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainKavaEvm.imageset/kava_evm.png b/Cosmostation/Resource/Chain.xcassets/chainKavaEvm.imageset/kava_evm.png new file mode 100644 index 000000000..4ccdd9d75 Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainKavaEvm.imageset/kava_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainOktEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainOktEvm.imageset/Contents.json new file mode 100644 index 000000000..8ebd4b102 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainOktEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "okt_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainOktEvm.imageset/okt_evm.png b/Cosmostation/Resource/Chain.xcassets/chainOktEvm.imageset/okt_evm.png new file mode 100644 index 000000000..760ba566c Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainOktEvm.imageset/okt_evm.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainOptimism.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainOptimism.imageset/Contents.json new file mode 100644 index 000000000..2cbbfaf30 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainOptimism.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "chain0013.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainOptimism.imageset/chain0013.png b/Cosmostation/Resource/Chain.xcassets/chainOptimism.imageset/chain0013.png new file mode 100644 index 000000000..213e81250 Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainOptimism.imageset/chain0013.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainOptimism2.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainOptimism2.imageset/Contents.json new file mode 100644 index 000000000..c33e1110d --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainOptimism2.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "optimism_side.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainOptimism2.imageset/optimism_side.png b/Cosmostation/Resource/Chain.xcassets/chainOptimism2.imageset/optimism_side.png new file mode 100644 index 000000000..f5988b59f Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainOptimism2.imageset/optimism_side.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainPolygon.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainPolygon.imageset/Contents.json new file mode 100644 index 000000000..70e1aaf27 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainPolygon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "polygon.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainPolygon.imageset/polygon.png b/Cosmostation/Resource/Chain.xcassets/chainPolygon.imageset/polygon.png new file mode 100644 index 000000000..84087e4cd Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainPolygon.imageset/polygon.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainPolygon2.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainPolygon2.imageset/Contents.json new file mode 100644 index 000000000..19e4f5c89 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainPolygon2.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "polygon_side.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainPolygon2.imageset/polygon_side.png b/Cosmostation/Resource/Chain.xcassets/chainPolygon2.imageset/polygon_side.png new file mode 100644 index 000000000..019ecfba2 Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainPolygon2.imageset/polygon_side.png differ diff --git a/Cosmostation/Resource/Chain.xcassets/chainXplaEvm.imageset/Contents.json b/Cosmostation/Resource/Chain.xcassets/chainXplaEvm.imageset/Contents.json new file mode 100644 index 000000000..71a50d8c6 --- /dev/null +++ b/Cosmostation/Resource/Chain.xcassets/chainXplaEvm.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "xpla_evm.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Chain.xcassets/chainXplaEvm.imageset/xpla_evm.png b/Cosmostation/Resource/Chain.xcassets/chainXplaEvm.imageset/xpla_evm.png new file mode 100644 index 000000000..08941b754 Binary files /dev/null and b/Cosmostation/Resource/Chain.xcassets/chainXplaEvm.imageset/xpla_evm.png differ diff --git a/Cosmostation/Resource/Token.xcassets/tokenEth_Op.imageset/Contents.json b/Cosmostation/Resource/Token.xcassets/tokenEth_Op.imageset/Contents.json new file mode 100644 index 000000000..46c44f1f6 --- /dev/null +++ b/Cosmostation/Resource/Token.xcassets/tokenEth_Op.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "eth-op.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Token.xcassets/tokenEth_Op.imageset/eth-op.png b/Cosmostation/Resource/Token.xcassets/tokenEth_Op.imageset/eth-op.png new file mode 100644 index 000000000..65b533bb3 Binary files /dev/null and b/Cosmostation/Resource/Token.xcassets/tokenEth_Op.imageset/eth-op.png differ diff --git a/Cosmostation/Resource/Token.xcassets/tokenMatic.imageset/Contents.json b/Cosmostation/Resource/Token.xcassets/tokenMatic.imageset/Contents.json new file mode 100644 index 000000000..df63ed96b --- /dev/null +++ b/Cosmostation/Resource/Token.xcassets/tokenMatic.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "matic.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Token.xcassets/tokenMatic.imageset/matic.png b/Cosmostation/Resource/Token.xcassets/tokenMatic.imageset/matic.png new file mode 100644 index 000000000..850fd8650 Binary files /dev/null and b/Cosmostation/Resource/Token.xcassets/tokenMatic.imageset/matic.png differ diff --git a/Cosmostation/Resource/Token.xcassets/tokenOp.imageset/Contents.json b/Cosmostation/Resource/Token.xcassets/tokenOp.imageset/Contents.json new file mode 100644 index 000000000..5419ac9a8 --- /dev/null +++ b/Cosmostation/Resource/Token.xcassets/tokenOp.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "op.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cosmostation/Resource/Token.xcassets/tokenOp.imageset/op.png b/Cosmostation/Resource/Token.xcassets/tokenOp.imageset/op.png new file mode 100644 index 000000000..e41c77187 Binary files /dev/null and b/Cosmostation/Resource/Token.xcassets/tokenOp.imageset/op.png differ diff --git a/Cosmostation/UI/Cell/AddressBookCell.swift b/Cosmostation/UI/Cell/AddressBookCell.swift index 9243e488b..1c9994dc7 100644 --- a/Cosmostation/UI/Cell/AddressBookCell.swift +++ b/Cosmostation/UI/Cell/AddressBookCell.swift @@ -32,7 +32,7 @@ class AddressBookCell: UITableViewCell { } func bindAddressBook(_ book: AddressBook) { - if (book.dpAddress.starts(with: "Ox")) { + if (book.dpAddress.starts(with: "0x")) { memoLabel.isHidden = true } else { diff --git a/Cosmostation/UI/Cell/ClaimAllChainCell.swift b/Cosmostation/UI/Cell/ClaimAllChainCell.swift index fcc9ad965..d5716085e 100644 --- a/Cosmostation/UI/Cell/ClaimAllChainCell.swift +++ b/Cosmostation/UI/Cell/ClaimAllChainCell.swift @@ -74,11 +74,11 @@ class ClaimAllChainCell: UITableViewCell { logoImg1.image = UIImage.init(named: chain.logo1) nameLabel.text = chain.name.uppercased() - if let evmChain = (chain as? EvmClass) { - if (evmChain.supportCosmos) { - cosmosTag.isHidden = false - } - } +// if let evmChain = (chain as? EvmClass) { +// if (evmChain.supportCosmos) { +// cosmosTag.isHidden = false +// } +// } if (!chain.isDefault) { legacyTag.isHidden = false diff --git a/Cosmostation/UI/Cell/PortfolioCell.swift b/Cosmostation/UI/Cell/PortfolioCell.swift index 941c6edc0..e9f079e32 100644 --- a/Cosmostation/UI/Cell/PortfolioCell.swift +++ b/Cosmostation/UI/Cell/PortfolioCell.swift @@ -86,7 +86,7 @@ class PortfolioCell: UITableViewCell { if (chain.supportCosmos) { tagLayer.isHidden = false - cosmosTag.isHidden = false +// cosmosTag.isHidden = false } if (chain.fetched) { diff --git a/Cosmostation/UI/Cell/SelectChainCell.swift b/Cosmostation/UI/Cell/SelectChainCell.swift index 0602cbf9a..9b6ce4032 100644 --- a/Cosmostation/UI/Cell/SelectChainCell.swift +++ b/Cosmostation/UI/Cell/SelectChainCell.swift @@ -60,9 +60,9 @@ class SelectChainCell: UITableViewCell { rootView.layer.borderColor = UIColor.white.withAlphaComponent(0.2).cgColor } - if (chain.supportCosmos) { - cosmosTag.isHidden = false - } +// if (chain.supportCosmos) { +// cosmosTag.isHidden = false +// } if (account.type == .withMnemonic) { hdPathLabel.text = chain.getHDPath(account.lastHDPath)