Skip to content

Commit

Permalink
Merge branch 'feature/staking' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonmcl
simonmcl committed Dec 4, 2024
2 parents 84e966d + fd34d38 commit f296b80
Show file tree
Hide file tree
Showing 20 changed files with 1,110 additions and 512 deletions.
18 changes: 15 additions & 3 deletions Kukai Mobile.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
C02F3CB22BFF5B6300FA6383 /* AccountsAddHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C02F3CB12BFF5B6300FA6383 /* AccountsAddHeaderCell.swift */; };
C02F3CB42BFF5B8E00FA6383 /* AccountsAddOptionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C02F3CB32BFF5B8E00FA6383 /* AccountsAddOptionCell.swift */; };
C02F3CB62BFF77A900FA6383 /* AddWalletViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C02F3CB52BFF77A900FA6383 /* AddWalletViewModel.swift */; };
C03016042CFF498D0058A457 /* PublicBakerAttributeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03016032CFF498D0058A457 /* PublicBakerAttributeCell.swift */; };
C03016062CFF49D90058A457 /* BakerDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03016052CFF49D90058A457 /* BakerDetailsViewModel.swift */; };
C03016082D007DB00058A457 /* SuggestedActionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03016072D007DB00058A457 /* SuggestedActionCell.swift */; };
C031D3E927D114A600EABBE6 /* TokenDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C031D3E827D114A600EABBE6 /* TokenDetailsViewController.swift */; };
C031D3EB27D114BC00EABBE6 /* TokenDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C031D3EA27D114BC00EABBE6 /* TokenDetailsViewModel.swift */; };
C031D3ED27D114D000EABBE6 /* CollectiblesDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C031D3EC27D114D000EABBE6 /* CollectiblesDetailsViewModel.swift */; };
Expand Down Expand Up @@ -545,6 +548,9 @@
C02F3CB12BFF5B6300FA6383 /* AccountsAddHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsAddHeaderCell.swift; sourceTree = "<group>"; };
C02F3CB32BFF5B8E00FA6383 /* AccountsAddOptionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsAddOptionCell.swift; sourceTree = "<group>"; };
C02F3CB52BFF77A900FA6383 /* AddWalletViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWalletViewModel.swift; sourceTree = "<group>"; };
C03016032CFF498D0058A457 /* PublicBakerAttributeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicBakerAttributeCell.swift; sourceTree = "<group>"; };
C03016052CFF49D90058A457 /* BakerDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BakerDetailsViewModel.swift; sourceTree = "<group>"; };
C03016072D007DB00058A457 /* SuggestedActionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestedActionCell.swift; sourceTree = "<group>"; };
C031D3E827D114A600EABBE6 /* TokenDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenDetailsViewController.swift; sourceTree = "<group>"; };
C031D3EA27D114BC00EABBE6 /* TokenDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenDetailsViewModel.swift; sourceTree = "<group>"; };
C031D3EC27D114D000EABBE6 /* CollectiblesDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectiblesDetailsViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1539,6 +1545,7 @@
children = (
C009308E28CB3DC500763885 /* ChooseBakerHeadingCell.swift */,
C0C6B5CC28CA25BD00368AEA /* PublicBakerCell.swift */,
C03016032CFF498D0058A457 /* PublicBakerAttributeCell.swift */,
);
path = Cells;
sourceTree = "<group>";
Expand Down Expand Up @@ -1637,6 +1644,7 @@
C0717B1D2A697D3D007F9419 /* EnterCustomBakerViewController.swift */,
C034F2C22A6A913B000F4C4C /* ChooseBakerConfirmViewController.swift */,
C034F2C42A6AD2E5000F4C4C /* BakerDetailsViewController.swift */,
C03016052CFF49D90058A457 /* BakerDetailsViewModel.swift */,
C0DB694A2CEE40D3000C1A17 /* StakeAmountViewController.swift */,
C0DB694C2CEF567A000C1A17 /* StakeConfirmViewController.swift */,
C04BA1F52CF765B900951249 /* StakeOnboardingContainerViewController.swift */,
Expand Down Expand Up @@ -1673,6 +1681,7 @@
isa = PBXGroup;
children = (
C054BCA32A682B6F006BDFBB /* BackUpCell.swift */,
C03016072D007DB00058A457 /* SuggestedActionCell.swift */,
C04E0EB12ADE7EE7001BF56F /* UpdateWarningCell.swift */,
C0D921D1293E49A20020E0BF /* TokenBalanceHeaderCell.swift */,
C08694DD27BD1B84000A4909 /* TokenBalanceCell.swift */,
Expand Down Expand Up @@ -2037,9 +2046,11 @@
C057CF622AB0BC0900E82D41 /* UIDevice+extensions.swift in Sources */,
C04E2868293F94EA00DC4171 /* TokenDetailsStakingRewardsCell.swift in Sources */,
C0FBC891292C12E200B29921 /* FavouriteBalancesViewController.swift in Sources */,
C03016042CFF498D0058A457 /* PublicBakerAttributeCell.swift in Sources */,
C02A4FDA27DA421100F42DE4 /* Date+extensions.swift in Sources */,
C0248CEE2AA21B5900B1F63C /* String+extensions_shared.swift in Sources */,
C003CECD27FDED5D00F64B4C /* CKRecord+extensions.swift in Sources */,
C03016082D007DB00058A457 /* SuggestedActionCell.swift in Sources */,
C04D985A2CE65884009491BD /* TokenDetailsStakeBalanceCell.swift in Sources */,
C06AEDFD2C00997E005CFDAA /* AddAccountViewController.swift in Sources */,
C04E2864293F94C500DC4171 /* TokenDetailsBalanceCell.swift in Sources */,
Expand Down Expand Up @@ -2166,6 +2177,7 @@
C049E74028819E3800887B64 /* DiscoverViewModel.swift in Sources */,
C0C6B5CF28CA27AF00368AEA /* ChooseBakerViewController.swift in Sources */,
C03BF88D2A279836003BD343 /* ActivityItemBatchCell.swift in Sources */,
C03016062CFF49D90058A457 /* BakerDetailsViewModel.swift in Sources */,
C04BA1F02CF4CFBE00951249 /* LearnMoreItemCell.swift in Sources */,
C01372B229B206FF0083E297 /* MenuHeaderCell.swift in Sources */,
C06AEDFF2C00998D005CFDAA /* AddAccountViewModel.swift in Sources */,
Expand Down Expand Up @@ -2525,7 +2537,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
OTHER_SWIFT_FLAGS = "";
Expand Down Expand Up @@ -2568,7 +2580,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
OTHER_CFLAGS = "";
OTHER_SWIFT_FLAGS = "-Xfrontend -internalize-at-link";
PRODUCT_BUNDLE_IDENTIFIER = "app.kukai.mobile${BUNDLE_ID_SUFFIX}";
Expand Down Expand Up @@ -2755,7 +2767,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
OTHER_CFLAGS = "";
OTHER_SWIFT_FLAGS = "-Xfrontend -internalize-at-link";
PRODUCT_BUNDLE_IDENTIFIER = "app.kukai.mobile${BUNDLE_ID_SUFFIX}";
Expand Down
Loading

0 comments on commit f296b80

Please sign in to comment.