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.

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

BUG2-212 Bump Abacus and fix candle charts #326

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Abacus (1.13.43)
- Abacus (1.13.44)
- AmplitudeSwift (1.11.2):
- AnalyticsConnector (~> 1.3.0)
- AnalyticsConnector (1.3.1)
Expand Down Expand Up @@ -379,7 +379,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/dydxprotocol/Charts.git

SPEC CHECKSUMS:
Abacus: 35d2c5bcaf2129cc2fc0045875bc6ff9831a5e31
Abacus: 696dd5dd93f6abc6cd19d5b9f134ff8f3b220f7c
AmplitudeSwift: ec670fe6f0a0b673bde44b6f02359993cc5513b1
AnalyticsConnector: 3def11199b4ddcad7202c778bde982ec5da0ebb3
AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae
Expand Down
6 changes: 3 additions & 3 deletions dydx/Pods/Local Podspecs/abacus.podspec.json

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

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ class dydxMarketPriceCandlesViewPresenter: HostedViewPresenter<dydxMarketPriceCa
CandleDataPoint(candle: candle, resolution: resolution.key)
}

if listInteractor.list as? [CandleDataPoint] != candleDataPoints {
if listInteractor.list as? [CandleDataPoint] != candleDataPoints {
listInteractor.list = [] // Needed to ensure the chart reloads properly
listInteractor.list = candleDataPoints
}
}
} else {
listInteractor.list = []
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,21 @@ final class CandleDataPoint: DictionaryEntity, LinearGraphingObjectProtocol, Can

required init() {}

override func isEqual(_ object: Any?) -> Bool {
guard let object = object as? CandleDataPoint else { return false }

return barY == object.barY &&
candleLabel == object.candleLabel &&
candleOpen == object.candleOpen &&
candleClose == object.candleClose &&
candleHigh == object.candleHigh &&
candleLow == object.candleLow &&
graphingX == object.graphingX &&
lineY == object.lineY &&
resolution == object.resolution &&
marketCandle == object.marketCandle
}

private lazy var unitInterval: Double = {
switch resolution {
case .FIVEMINS:
Expand Down
2 changes: 1 addition & 1 deletion podspecs/Abacus.podspec
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.13.43'
spec.version = '1.13.44'
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