Skip to content

Commit

Permalink
Bump Abacus and update transfer status logic
Browse files Browse the repository at this point in the history
  • Loading branch information
ruixhuang committed Oct 25, 2024
1 parent eb05ab1 commit 07d151b
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 69 deletions.
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.12)
- Abacus (1.13.13)
- AmplitudeSwift (1.9.4):
- 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: 682223d06367d333dd7b409eab20463fee21cf6a
Abacus: 2868046638aa194188f754d36dc3063e226c9332
AmplitudeSwift: d10ae6afdb0740e4ae843866bce8ab1119a53d74
AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9
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 @@ -423,7 +423,7 @@ class dydxTransferInputCtaButtonViewPresenter: HostedViewPresenter<dydxTradeInpu

private func addTransferHash(hash: String, fromChainName: String?, toChainName: String?, transferInput: TransferInput) {
let transfer = dydxTransferInstance(transferType: transferType.transferInstanceType,
transactionHash: hash,
transactionHash: hash.lowercased(),
fromChainId: transferInput.requestPayload?.fromChainId,
fromChainName: fromChainName,
toChainId: transferInput.requestPayload?.toChainId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ private class dydxTransferStatusViewPresenter: HostedViewPresenter<dydxTransferS

step1.tapAction = createUrlAction(url: status.fromChainStatus?.transactionUrl)
step2.tapAction = createUrlAction(url: status.axelarTransactionUrl)

step3.tapAction = createUrlAction(url: status.toChainStatus?.transactionUrl)
} else {
step1.status = .inProgress
}
Expand Down Expand Up @@ -249,8 +249,9 @@ private class dydxTransferStatusViewPresenter: HostedViewPresenter<dydxTransferS
}
}

step1.tapAction = createMintScanUrlAction(transfer: transfer, mintscanUrl: mintscanUrl)
step1.tapAction = createUrlAction(url: status.fromChainStatus?.transactionUrl)
step2.tapAction = createUrlAction(url: status.axelarTransactionUrl)
step3.tapAction = createUrlAction(url: status.toChainStatus?.transactionUrl)

Console.shared.log("Transfer status \(String(describing: status.status)), Gas status \(String(describing: status.gasStatus))")
} else {
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.12'
spec.version = '1.13.13'
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

0 comments on commit 07d151b

Please sign in to comment.