Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Abacus to 1.11.10 #257

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Bump Abacus to 1.11.10 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dydx/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Abacus (1.11.8)
- Abacus (1.11.10)
- AmplitudeSwift (1.9.2):
- AnalyticsConnector (~> 1.0.1)
- AnalyticsConnector (1.0.3)
Expand Down Expand Up @@ -382,7 +382,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/dydxprotocol/Charts.git

SPEC CHECKSUMS:
Abacus: efa51dd0b59c431f3377054398c82884001f54eb
Abacus: 8c4072d2e5baa9f48abe95684ac854eaf37ab3d8
AmplitudeSwift: 6c2c689f7dc83e6d9d90b7f53b93433c1436196a
AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9
AppsFlyerFramework: 3c6c50b7b3f0f37f648a5b23114940e0766e65e8
Expand Down
6 changes: 3 additions & 3 deletions dydx/Pods/Local Podspecs/abacus.podspec.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dydx/Pods/Manifest.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 58 additions & 58 deletions dydx/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions ...senters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class dydxPortfolioPositionsViewPresenter: HostedViewPresenter<dydxPortfolioPosi
super.init()

self.viewModel = viewModel

viewModel?.vaultTapAction = {
Router.shared?.navigate(to: RoutingRequest(path: "/vault"), animated: true, completion: nil)
}
Expand Down Expand Up @@ -54,17 +54,17 @@ class dydxPortfolioPositionsViewPresenter: HostedViewPresenter<dydxPortfolioPosi
self?.updatePendingPositions(pendingPositions: pendingPositions, marketMap: marketMap, assetMap: assetMap)
}
.store(in: &subscriptions)

Publishers.CombineLatest(
AbacusStateManager.shared.state.onboarded,
//TODO: replace with actual vault info from abacus
// TODO: replace with actual vault info from abacus
AbacusStateManager.shared.state.onboarded
).sink { [weak self] onboarded, _ in
if onboarded,
if onboarded,
let viewModel = self?.viewModel,
//TODO: replace with actual vault info from abacus
let vaultBalance = Optional<Double>(420.42),
let vaultApy = Optional<Double>(Double.random(in: -30...30)) {
// TODO: replace with actual vault info from abacus
let vaultBalance = Double?(420.42),
let vaultApy = Double?(Double.random(in: -30...30)) {
viewModel.vaultBalance = dydxFormatter.shared.dollar(number: vaultBalance, digits: 2)
viewModel.vaultApy = vaultApy
}
Expand Down
10 changes: 5 additions & 5 deletions dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel {
@Published public var vaultBalance: String?
@Published public var vaultApy: Double?
@Published public var vaultTapAction: (() -> Void)?

public var contentChanged: (() -> Void)?

init(
Expand Down Expand Up @@ -334,7 +334,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel {
.wrappedInAnyView()
}
}

@ViewBuilder
public var apyAccessory: some View {
if let vaultApy, let vaultApyText = dydxFormatter.shared.percent(number: vaultApy, digits: 2) {
Expand All @@ -347,7 +347,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel {
.cornerRadius(4)
}
}

public var megaVaultBalanceRowHeader: some View {
HStack(spacing: 0) {
Text(localizerPathKey: "APP.GENERAL.DETAILS")
Expand All @@ -360,7 +360,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel {
}
.padding(.horizontal, 16)
}

@ViewBuilder
public var megaVaultBalanceRow: some View {
if let vaultBalance {
Expand All @@ -386,7 +386,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel {
.cornerRadius(16)
}
}

@ViewBuilder
public var megaVaultSection: some View {
if dydxBoolFeatureFlag.isVaultEnabled.isEnabled {
Expand Down
2 changes: 1 addition & 1 deletion podspecs/Abacus.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Abacus'
spec.version = '1.11.8'
spec.version = '1.11.10'
spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :git => "[email protected]:dydxprotocol/v4-abacus.git", :tag => "v#{spec.version}" }
spec.authors = ''
Expand Down
Loading