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

Merge develop into release branch #293

Merged
merged 4 commits into from
Nov 11, 2024
Merged

Merge develop into release branch #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2a6574
Update token name from asset.id to asset.displayableAssetId (#289)
ruixhuang Nov 6, 2024
295c39e
Lots of bug fixes and vault clean-ups (#290)
ruixhuang Nov 8, 2024
c078fa1
Fixing a regression of tab bar view flashing and market list scrollin…
ruixhuang Nov 10, 2024
58bc0b8
Merge branch 'develop' into features/merge_from_dev
ruixhuang Nov 11, 2024
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
12 changes: 6 additions & 6 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.13.18)
- Abacus (1.13.19)
- AmplitudeSwift (1.10.1):
- AnalyticsConnector (~> 1.0.1)
- AnalyticsConnector (1.0.3)
Expand Down Expand Up @@ -256,11 +256,11 @@ PODS:
- SDWebImage/Core (5.20.0)
- SDWebImageSVGCoder (1.7.0):
- SDWebImage/Core (~> 5.6)
- SDWebImageSwiftUI (3.1.1):
- SDWebImageSwiftUI (3.1.3):
- SDWebImage (~> 5.10)
- SimpleKeychain (0.12.5)
- SnapKit (5.7.1)
- Statsig (1.48.0)
- Statsig (1.48.1)
- SVGKit (3.0.0):
- CocoaLumberjack (~> 3.0)
- Validator (3.2.1)
Expand Down Expand Up @@ -382,7 +382,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/dydxprotocol/Charts.git

SPEC CHECKSUMS:
Abacus: ad923b7bd4d7a7dc4824a5b88130f0d7c56af1d0
Abacus: 8f260c5639033d002ce9584113192b64d1ea6d5e
AmplitudeSwift: 9a4b3e0cb70ad8f89176925e7a6f979c5d48f362
AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9
AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae
Expand Down Expand Up @@ -433,10 +433,10 @@ SPEC CHECKSUMS:
ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
SDWebImageSwiftUI: dcff3d05fd0579ff280221ae8856c34ac3b67f25
SDWebImageSwiftUI: a6d7129fb68fc18c8b930b869ddcfce314e49ded
SimpleKeychain: 8193a9e40967eccac933c1fde82de46c07a5ae26
SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
Statsig: e4a2bb505d5f809f684908820a234c93ef3d1996
Statsig: b3ce932e479889e01611bebe92d77433ab280c4d
SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
Validator: 80a6f567220c962dfd2d9928ae98a8c1d164f6f4
ZSWTappableLabel: 92f11d677bb395a8294df48482316c4981783ca0
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.

12 changes: 6 additions & 6 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.

130 changes: 65 additions & 65 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.

Loading
Loading