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

CLI-628: vault landing screen positions list #228

Closed
Closed
Changes from 1 commit
Commits
Show all changes
236 commits
Select commit Hold shift + click to select a range
4702ee7
initial code commit
mikemag-dev Nov 3, 2023
497ca6a
catchup
mike-dydx Nov 6, 2023
28e5812
clean up and add animation
mike-dydx Nov 6, 2023
6bbae21
Merge pull request #2 from dydxprotocol/mike/trcl-3095-orderbook-asks…
ruixhuang Nov 6, 2023
1513130
change details font color to match
mike-dydx Nov 6, 2023
9568460
update PR template
mike-dydx Nov 6, 2023
6b7aab9
[Draft] Clean up MarketInfo data and add SwiftLint action (#3)
ruixhuang Nov 6, 2023
32f1f31
Merge pull request #4 from dydxprotocol/mike/trcl-3055-market-differe…
johnqh Nov 6, 2023
ecab293
Add Swiftlint to git pre-commit (#6)
ruixhuang Nov 7, 2023
4888ce4
stay on market screen after trade
mike-dydx Nov 7, 2023
27e73e0
Merge pull request #7 from dydxprotocol/mike/trcl-3052-after-placing-…
ruixhuang Nov 7, 2023
185f835
Update all FE license file
johnqh Nov 7, 2023
411b3fa
Load AppScheme from env.jsons and add scripts to update the info.plis…
ruixhuang Nov 7, 2023
2642504
Lint
ruixhuang Nov 7, 2023
86090f8
TRCL-3132 TRCL-3182 Alignments changes, and removed some v3 items fro…
johnqh Nov 7, 2023
50b6e8c
Merge pull request #8 from dydxprotocol/feature/TRCL-3132-Market-details
johnqh Nov 7, 2023
c831f3d
point to new cartera repo (#9)
mike-dydx Nov 7, 2023
3d7d934
Merge branch 'main' into features/app_scheme
ruixhuang Nov 7, 2023
db1e93f
format good til as a time. do "-" if created at is unavailable
mike-dydx Nov 7, 2023
ba0d84c
Fix
ruixhuang Nov 7, 2023
96e49d3
Merge pull request #10 from dydxprotocol/features/app_scheme
johnqh Nov 8, 2023
1ad959a
Fix build
ruixhuang Nov 8, 2023
2fe014b
address comment
mike-dydx Nov 8, 2023
94f4cf1
Merge pull request #11 from dydxprotocol/mike/trcl-2408-show-good-til…
johnqh Nov 8, 2023
b5d65b3
Merge pull request #12 from dydxprotocol/features/fix_build
johnqh Nov 8, 2023
759c7d2
Bump Abacus and show transfer error message (#15)
ruixhuang Nov 9, 2023
c87c94a
update app icon (#17)
mike-dydx Nov 10, 2023
d4d164d
Remove CryptoSwift Pod (#13)
ruixhuang Nov 10, 2023
6a17a92
TRCL-3204 Update Abacus and v4-client (#18)
johnqh Nov 10, 2023
d68eee6
TRCL-2841 : Trading Network current value not shown on Settings (#19)
mike-dydx Nov 10, 2023
e5df68d
Use the Info.plist scheme for router. And updated Abacus (#14)
johnqh Nov 10, 2023
961fb64
make portfolio selector sticky (#20)
mike-dydx Nov 10, 2023
93a4303
Add FF settings to load custom deployment URL (#21)
ruixhuang Nov 10, 2023
949a7fa
update app icon (#22)
mike-dydx Nov 20, 2023
97ade94
Update amount from double to string (#24)
ruixhuang Nov 22, 2023
a9d3886
TRCL-2984 : Create 3P Suggested Release Instructions doc (#23)
mike-dydx Nov 22, 2023
7ee3f42
Bump Abacus and check for transferStatus.squidTransactionStatus. (#25)
ruixhuang Nov 22, 2023
56e7deb
Made layout consistent between orders and fills (#26)
ruixhuang Nov 27, 2023
4a7f0cc
Localization update (#27)
ruixhuang Nov 27, 2023
16f98d7
Add CCTP under feature flag (#28)
ruixhuang Nov 28, 2023
1248e82
update copyright & add disclaimer (#29)
mike-dydx Nov 28, 2023
4d74286
TRCL-3098 : Add transfer entry point to profile page (#30)
mike-dydx Nov 29, 2023
2fe80f9
TRCL-3276 Fetch CCTP transfer status (#31)
ruixhuang Nov 29, 2023
f37ef38
TRCL-3281 : Add transfer entry point to profile page pt 2 - UI Tweaks…
mike-dydx Dec 1, 2023
0cdfda8
reduce only view to show always, supports disabled state (#33)
mike-dydx Dec 1, 2023
75350d0
TRCL-2878 CCTP deposit integration (#34)
ruixhuang Dec 2, 2023
1883d25
Mike/trcl 3314 trading rewards profile card (#36)
mike-dydx Dec 4, 2023
c1ad45e
Fix update view (#35)
ruixhuang Dec 4, 2023
df8469b
TRCL-3317 : Trading Rewards Detail Screen Rewards Summary Card (#37)
mike-dydx Dec 5, 2023
021dcac
TRCL-3318 : Trading Rewards Details Screen Help Card (#38)
mike-dydx Dec 6, 2023
9b52cb9
Fix the issue of release build not getting the feature flag values (#40)
ruixhuang Dec 7, 2023
64eeec7
TRCL-3319 : Trading Rewards Details Screen History Card (#41)
mike-dydx Dec 8, 2023
b2aa1f6
add learn more cards to trading rewards screen (#42)
mike-dydx Dec 11, 2023
cddfbfd
TRCL-3316 : Trading Rewards Detail Screen Estimated Rewards Card (#43)
mike-dydx Dec 12, 2023
1f7077c
Update .gitignore (#44)
mike-dydx Dec 15, 2023
f6e022b
TRCL-3415 CCTP Withdrawal (#45)
ruixhuang Dec 19, 2023
bf667a7
Create config.yml (#47)
mike-dydx Dec 21, 2023
2114365
add script to update v4-native-client.js (#48)
mike-dydx Dec 21, 2023
79ea703
TRCL-3408 : Trading Rewards hook in real data (#46)
mike-dydx Jan 3, 2024
04ef9e5
Bump Abacus (#49)
ruixhuang Jan 3, 2024
bac09f6
TRCL-3367 : Update Colors to Match Design (#39)
mike-dydx Jan 3, 2024
7133f9b
remove governance and staking cards, replace strings (#50)
mike-dydx Jan 4, 2024
8f1c70b
TRCL-3370 Depth chart highlight, total cost was always $0 (#52)
johnqh Jan 10, 2024
82dbd65
TRCL-3441 : Add Tooltip to Rewards History (#51)
mike-dydx Jan 10, 2024
a4d5b61
clean up settings files, remove trading network selector from standar…
mike-dydx Jan 11, 2024
c4881e6
update workflows (#55)
mike-dydx Jan 12, 2024
46bbbb3
bump abacus (#57)
mike-dydx Jan 19, 2024
babf5b3
Remove cctp feature flag (#58)
ruixhuang Jan 20, 2024
a45e882
Update v4-native-client.js (#59)
mike-dydx Jan 22, 2024
a7e938f
update client js from branch without cctp breaking changes (#60)
mike-dydx Jan 23, 2024
278a57b
Fee screen layout fix (#61)
johnqh Jan 24, 2024
203b15b
Bump V4-client (#62)
ruixhuang Jan 24, 2024
f438ee8
TRCL-3496 Reduce Profile->History tab height (#63)
ruixhuang Jan 24, 2024
efe3ffb
Portfolio chart timeline has the selector defaults to 7d, but is disp…
ruixhuang Jan 24, 2024
6b1ed14
default to sepolia chain id (#65)
mike-dydx Jan 24, 2024
0468a9d
TRCL-3513 Have price on the left for bids when show orderbook side by…
johnqh Jan 24, 2024
165b5a8
update app scheme and bundle display name (#66)
mike-dydx Jan 24, 2024
3926f84
Feature/trcl 3501 reduce only post only (#69)
johnqh Jan 25, 2024
eb269da
Cleaned up order details (#71)
johnqh Jan 25, 2024
c8f777b
fix displaying "-$0" (#68)
mike-dydx Jan 25, 2024
9f21007
update abacus and v4-client (#72)
mike-dydx Jan 29, 2024
40ec2a6
use production firebase config only for app store installs (#74)
mike-dydx Jan 29, 2024
12d2e50
Safer check of .appStore vs .testFlight build, and enables TESTFLIGHT…
johnqh Jan 30, 2024
c280d20
Feature/debug (#77)
johnqh Jan 30, 2024
ffc7ced
add default icon for transfer search items (#78)
mike-dydx Jan 30, 2024
0d9031b
remove setting default env (#79)
mike-dydx Jan 30, 2024
cb30a4a
bump abacus to 1.3.6 (#80)
mike-dydx Jan 31, 2024
54e3c34
MOB-88 : Scrolling Trades and then Tapping Orders Breaks Scroll (#81)
mike-dydx Feb 2, 2024
dfcca6c
update bitrise config (#82)
mike-dydx Feb 4, 2024
bb56913
MOB-181 : Tap Orderbook Price to Set Limit Price (#83)
mike-dydx Feb 5, 2024
3ec9a6a
MOB-95 : Improve draft hide/show animation (#84)
mike-dydx Feb 6, 2024
ba8147b
MOB-94 : match signed number formatting to web (#86)
mike-dydx Feb 14, 2024
9b9efd8
Add color preference settings (#85)
ruixhuang Feb 15, 2024
48f9a05
MOB-73 : Trading Rewards hook in real data pt 1 (non-chaos labs data)…
mike-dydx Feb 15, 2024
b39dba3
Add v4-web and template installation to bootstrap.sh (#88)
ruixhuang Feb 20, 2024
453ea12
bump abacus (#90)
mike-dydx Feb 20, 2024
2ab514d
bump abacus to 1.4.10 (#91)
mike-dydx Feb 20, 2024
1becae4
update abacus protocol implementation to fix compilation (#93)
mike-dydx Feb 21, 2024
19acea5
Update config.yml (#89)
mike-dydx Feb 21, 2024
53ef359
SDWebImageSVGKitPlugin -> SDWebImageSVGCoder (#95)
mike-dydx Feb 21, 2024
5f40563
MOB-250 : Add metric to track screenshot taken (#96)
mike-dydx Feb 22, 2024
024ec0a
MOB-240 : Trading Rewards hook in real data pt 2 (launch incentives) …
mike-dydx Feb 22, 2024
0393417
fix trading rewards background image (#97)
mike-dydx Feb 27, 2024
a7ae082
MOB-252 : Add link to share app on profile screen (#98)
mike-dydx Feb 27, 2024
f7d72b2
collect feedback from settings menu (#99)
mike-dydx Feb 28, 2024
a0ed62e
Update license (#100)
ruixhuang Feb 28, 2024
c115f88
MOB-299 : update `connectWallet` parameters to support memo field (#103)
mike-dydx Mar 5, 2024
57c975b
MOB-297: Fix total dydx amount not populated from Profile tab (#101)
ruixhuang Mar 5, 2024
9add02e
MOB-242 : implement logic to display pre-prompt and then ask for app …
mike-dydx Mar 5, 2024
6410ade
update app review pre-prompt to match design (#104)
mike-dydx Mar 6, 2024
04b2381
Update README.md (#105)
ruixhuang Mar 6, 2024
f054cc2
add `screen_view` event for better firebase analytics integration (#106)
mike-dydx Mar 6, 2024
f9e7810
MOB-309 : add additional logic to rate app flow where `requestReview`…
mike-dydx Mar 7, 2024
70ec871
MOB-295: Add iOS tooling scripts for UI testings (#56)
ruixhuang Mar 8, 2024
4defb8a
MOB-308: iOS: Handle deposit flow when user onboarded via Desktop Sca…
ruixhuang Mar 8, 2024
bc9bce5
update satoshi fonts to go from regular to medium (#109)
mike-dydx Mar 12, 2024
83fb052
MOB-326 : update resources to use satoshi-medium instead of satoshi-r…
mike-dydx Mar 12, 2024
703413e
MOB-328 Correlate x-request-id to correlate route requests from Squid…
ruixhuang Mar 13, 2024
6ff0ec4
MOB-316 : Display markets list when market title is tapped on trade p…
mike-dydx Mar 14, 2024
1cf8481
bump abacus (#113)
mike-dydx Mar 14, 2024
a41c334
MOB-346 : pre-select last selected market for trade input if no marke…
mike-dydx Mar 14, 2024
a905e1b
MOB-333 Withdrawal error message "insufficient balance" but it seems …
ruixhuang Mar 14, 2024
8dca944
update classname to fix routing (#116)
mike-dydx Mar 15, 2024
c47b0d9
abacus 1.6.5 -> 1.6.6 (#117)
mike-dydx Mar 15, 2024
ddb88e7
add privacy info file per apple (#118)
mike-dydx Mar 15, 2024
24fa6db
Bump Abacus and link to system status (#119)
ruixhuang Mar 19, 2024
d82ac66
MOB-386 Fix Subaccount transfer for France (#121)
ruixhuang Mar 21, 2024
9505e26
Feature/mob 353 abacus update (#120)
johnqh Mar 26, 2024
5622ae8
MOB-409 Onboarding and transfer analytics (#122)
ruixhuang Mar 28, 2024
9c2c657
MOB-417 : add settings control to turn in-app notifications on/off co…
mike-dydx Mar 29, 2024
3d4dd12
bump to 1.6.23 (#125)
mike-dydx Mar 29, 2024
0ff3418
add tp/sl button and screen stub (#126)
mike-dydx Apr 1, 2024
8dd656d
MOB-102 : iOS: Update Withdraw Dialog for withdrawal limits (#123)
mike-dydx Apr 1, 2024
7bdb81c
add entry price and oracle price receipt area (#127)
mike-dydx Apr 1, 2024
3aa9602
MOB-433 Remove FullStory (#128)
ruixhuang Apr 3, 2024
da28dc9
bump abacus to 1.6.28 (#130)
mike-dydx Apr 3, 2024
59e52e9
MOB-427 : add TL/SL inputs to price triggers panel screen (#129)
mike-dydx Apr 4, 2024
f9be690
MOB-437 : add TL/SL inputs to price triggers panel screen (multiple o…
mike-dydx Apr 4, 2024
872915f
Fix wrong localization key (#132)
ruixhuang Apr 8, 2024
99aff13
Update settings.json (#133)
mike-dydx Apr 8, 2024
d84688d
initialize settings dict with values (#135)
mike-dydx Apr 8, 2024
3db65fe
Update v4-native-client.js (#136)
ruixhuang Apr 8, 2024
aa923b6
bump 1.6.28 -> 1.6.36 (#137)
mike-dydx Apr 10, 2024
e54c229
Mike/mob 428 add custom amount to price triggers screen (#134)
mike-dydx Apr 10, 2024
f8dd4ff
bump 1.6.36 -> 1.6.38 (#138)
mike-dydx Apr 10, 2024
1fecc2e
MOB-452 : add cta button to submit trades (#139)
mike-dydx Apr 12, 2024
4b3d5de
bump abacus 1.6.38->1.6.41 (#141)
mike-dydx Apr 12, 2024
a004d79
Allow null ethereamAddress when starting up Abacus at launch. (#142)
ruixhuang Apr 12, 2024
444fd4e
MOB-428 : add custom amount to price triggers screen (#140)
mike-dydx Apr 12, 2024
1e8eb29
MOB-429 : add limit price to price triggers screen (#144)
mike-dydx Apr 22, 2024
2f8ed2a
bump to 1.6.43 (#146)
mike-dydx Apr 23, 2024
33ef2fb
MOB-456 : integrate abacus validation error with button states (#145)
mike-dydx Apr 23, 2024
a60e269
MOB-431 : add TP/SL display to market screen (#147)
mike-dydx Apr 25, 2024
9426e70
bump abacus 1.6.50 (#148)
mike-dydx Apr 26, 2024
8b510bc
MOB-461 : TP/SL cleanup & testing (#149)
mike-dydx Apr 29, 2024
58ce90d
Bump Abacus (#150)
ruixhuang Apr 30, 2024
44bbb8a
MOB-465 Integrate Abacus changes for trigger order notification (#151)
ruixhuang Apr 30, 2024
337f55a
bump to 1.6.55 (#153)
mike-dydx May 2, 2024
4b05de9
MOB-467 : Wait for submission to complete before dismissing (#152)
mike-dydx May 3, 2024
3f95751
handle new compliance statuses (#154)
mike-dydx May 3, 2024
629f7d6
SL/TP clean up (#155)
mike-dydx May 3, 2024
d05163e
MOB-330: Upgrade SDWebImageSwiftUI pod (#156)
ruixhuang May 6, 2024
8a9731f
MOB-395 Modify position cell to indicate whether it is cross or isol…
ruixhuang May 7, 2024
a6dccad
Bump Abacus and v4-client (#159)
ruixhuang May 8, 2024
499948a
MOB-483 Add isolated / cross margin mode button, Add target leverage …
ruixhuang May 8, 2024
0dde63c
MOB-357 Margin Mode Selection Screen (#160)
ruixhuang May 9, 2024
9274f6a
MOB-359 Target Leverage Selection Screen (#161)
ruixhuang May 9, 2024
50f77bc
MOB-493 iOS - Adjust margin screen for isolated margin UI (#162)
ruixhuang May 10, 2024
a372864
remove `if DEBUG` check for sltp functionality, use abacus feature fl…
mike-dydx May 13, 2024
f841bb0
Bump Abacus and v4-client (#164)
ruixhuang May 13, 2024
51645f8
fix value formatting and UI layout bug (#165)
mike-dydx May 14, 2024
424f0b7
Bump Abacus (#166)
ruixhuang May 14, 2024
f6da98c
MOB-486 iOS: Log error into Crashlytics (#167)
ruixhuang May 14, 2024
97dc9f9
bump to 1.7.18 (#168)
mike-dydx May 15, 2024
3740d9a
analyticsv2 PoC (#169)
mike-dydx May 21, 2024
c076da9
add footer support, add coming soon copy (#170)
mike-dydx May 24, 2024
d13fbf4
bump to 1.7.32 (#171)
mike-dydx May 28, 2024
d82e8e1
resolve build issue (#172)
mike-dydx May 29, 2024
50e7b07
pipe in expiresAt and support email (#173)
mike-dydx May 29, 2024
c08e065
fix platform list footer display logic (#174)
mike-dydx May 29, 2024
f41ff99
Update Abacus.podspec (#176)
mike-dydx May 29, 2024
7dddb12
Bump v4-client to 1.1.15 (#177)
prashanDYDX May 30, 2024
25d7d10
Update v4-clients to 1.1.16 (#178)
prashanDYDX May 31, 2024
c9e87b2
bump abacus to 1.7.47 (#179)
mike-dydx Jun 3, 2024
7a50efd
isolated markets integration pt. 1 (#175)
mike-dydx Jun 4, 2024
e0450f9
revert firebase version change (#180)
mike-dydx Jun 4, 2024
4f95ce5
update pods
mike-dydx Jun 5, 2024
dcf0f9f
ensure `enable_app_rating` defaults to true if feature flags do not w…
mike-dydx Jun 5, 2024
8264f8b
Revert "update pods"
mike-dydx Jun 5, 2024
93d09df
Revert "ensure `enable_app_rating` defaults to true if feature flags …
mike-dydx Jun 5, 2024
a87b92e
fix app launch hang up (#183)
mike-dydx Jun 5, 2024
82be650
add memo warning to transfer input (#181)
mike-dydx Jun 5, 2024
88f979e
conditionally display warning for non-usdc (#184)
mike-dydx Jun 5, 2024
e89aaba
do not render svgs (#185)
mike-dydx Jun 6, 2024
3f75663
isolated markets integration pt. 2 (#187)
mike-dydx Jun 7, 2024
0761154
Bump Abacus and v4-client (#188)
ruixhuang Jun 11, 2024
c398092
MOB-544 Add preference setting for gas payment type (#189)
ruixhuang Jun 11, 2024
5702268
isolated markets integration pt3 (#190)
mike-dydx Jun 12, 2024
a66f9cc
unopened isolated positions pt1 (#191)
mike-dydx Jun 17, 2024
c645861
remove isolated markets feature flag (#192)
mike-dydx Jun 18, 2024
75a7842
unopened isolated positions pt2 - cancel flow (#195)
mike-dydx Jun 19, 2024
58bfbe4
unopened isolated positions pt2 follow up - empty state (#197)
mike-dydx Jun 19, 2024
9832567
Remove gas option from settings for release build (#198)
ruixhuang Jun 21, 2024
dfb59fd
edit margin from market view (#200)
mike-dydx Jun 24, 2024
d8b9833
add new receipt lines (#199)
mike-dydx Jun 25, 2024
89d02fa
MOB-573 & MOB-586 : ISO Bug - iOS: On Position Cards, show dollar amo…
mike-dydx Jun 26, 2024
8f3d0b5
isolated position testing follow-ups (#202)
mike-dydx Jun 28, 2024
ef2df3b
final isolated markets tweaks (#204)
mike-dydx Jun 28, 2024
841d781
handle short position case for displaying liquidation price, live-upd…
mike-dydx Jul 1, 2024
edb05e9
MOB-601 : Position Card Updates (#206)
mike-dydx Jul 2, 2024
7042a5b
bump abacus to 1.8.20 (#207)
mike-dydx Jul 2, 2024
62c4206
fix cancel orders bug when orders cancellations fail (#208)
mike-dydx Jul 2, 2024
5672e4b
Update dydxMarketInfoViewBuilder.swift (#209)
mike-dydx Jul 3, 2024
baaf082
bump abacus to 1.8.35 (#211)
mike-dydx Jul 11, 2024
efe074d
Turn on Skip (#212)
mike-dydx Jul 18, 2024
da42677
fix skip mutli-tx withdrawal (#214)
mike-dydx Jul 24, 2024
2caf35d
add slider to target leverage screen (#213)
mike-dydx Jul 25, 2024
24ff3f7
Bump Abacus and v4-client (#216)
ruixhuang Jul 26, 2024
ccdd69c
integrate statsig (#215)
mike-dydx Jul 27, 2024
7886d7c
Update subaccount transfer threshold to 0.5 (#217)
ruixhuang Jul 29, 2024
849ed21
default skip on, persist feature flags through session (#218)
mike-dydx Jul 29, 2024
147c1ef
Swap out incentives blog link (#219)
prashanDYDX Aug 1, 2024
3e46321
vault landing (#220)
mike-dydx Aug 2, 2024
bb5ea49
CLI-627: vault landing screen graph (#221)
mike-dydx Aug 8, 2024
fd3b46d
bump abacus (#224)
mike-dydx Aug 8, 2024
c2cd3da
CLI-638: prediction markets UI (#222)
mike-dydx Aug 9, 2024
8a8a45b
return optional feature flag value so default works (#225)
mike-dydx Aug 9, 2024
3547e49
dump feature flags to user properties (#223)
mike-dydx Aug 9, 2024
590db8e
CLI-638: iOS prediction markets UI (#226)
mike-dydx Aug 13, 2024
233a3e6
CLI-641: USDC sweep into subaccount does not work for fresh address (…
mike-dydx Aug 13, 2024
07e44c9
display id updates, abacus -> 1.8.90 (#229)
mike-dydx Aug 19, 2024
141b420
add sections to vault position view
mike-dydx Aug 15, 2024
9867de6
scrolling touchups
mike-dydx Aug 15, 2024
36c5459
keep chart vm in memory
mike-dydx Aug 15, 2024
8a2b683
polish
mike-dydx Aug 19, 2024
3828094
remove unnecessary chart notifications
mike-dydx Aug 19, 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
Prev Previous commit
Next Next commit
Load AppScheme from env.jsons and add scripts to update the info.plis…
…t during build
  • Loading branch information
ruixhuang committed Nov 7, 2023
commit 411b3fa987fa294b0ed217f56c19602f6ae989e1
Original file line number Diff line number Diff line change
@@ -16,9 +16,11 @@ import JedioKit

open class SettingsViewPresenter: BaseSettingsViewPresenter {
private let keyValueStore: KeyValueStoreProtocol?
private let appScheme: String?

public init(definitionFile: String, keyValueStore: KeyValueStoreProtocol?) {
public init(definitionFile: String, keyValueStore: KeyValueStoreProtocol?, appScheme: String?) {
self.keyValueStore = keyValueStore
self.appScheme = appScheme
super.init(definitionFile: definitionFile)
}

@@ -148,7 +150,8 @@ open class SettingsViewPresenter: BaseSettingsViewPresenter {

open func createOutputItem(output: FieldOutput) -> FieldOutputTextViewModel {
let textViewModel = FieldOutputTextViewModel(output: output)
if let routingRequest = output.routingRequest() {
if let appScheme = appScheme, let link = output.link?.replacingOccurrences(of: "{APP_SCHEME}", with: appScheme) {
let routingRequest = RoutingRequest(url: link)
textViewModel.onTapAction = {
Router.shared?.navigate(to: routingRequest, animated: true, completion: nil)
}
9 changes: 9 additions & 0 deletions RoutingKit/RoutingKit/_Router/MappedRouter.swift
Original file line number Diff line number Diff line change
@@ -131,6 +131,15 @@ open class MappedRouter: NSObject, RouterProtocol, ParsingProtocol, CombineObser
parse(dictionary: destinations, shared: shared)
}
}

public init(jsonString: String) {
super.init()
let shared = JsonLoader.load(bundles: Bundle.particles, fileName: "routing_shared.json") as? [String: Any]
if let data = jsonString.data(using: .utf8),
let destinations = JsonLoader.load(data: data) as? [String: Any] {
parse(dictionary: destinations, shared: shared)
}
}

public func parse(dictionary: [String: Any], shared: [String: Any]?) {
if let defaultData = dictionary["defaults"] as? [String: String] {
2 changes: 2 additions & 0 deletions Utilities/Utilities.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -1065,6 +1065,8 @@
Base,
);
mainGroup = 31E65AAF216BC9C9008ABEE9;
packageReferences = (
);
productRefGroup = 31E65ABA216BC9C9008ABEE9 /* Products */;
projectDirPath = "";
projectRoot = "";
4 changes: 4 additions & 0 deletions Utilities/Utilities/_Utils/JsonLoader.swift
Original file line number Diff line number Diff line change
@@ -39,4 +39,8 @@ import Foundation
@objc public class func load(bundled fileName: String?) -> Any? {
return load(bundle: Bundle.main, fileName: fileName)
}

@objc public class func load(data: Data) -> Any? {
return try? JSONSerialization.jsonObject(with: data, options: [])
}
}
2 changes: 1 addition & 1 deletion dydx/PodFile
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ end

def util_pods
pod 'BigInt'
pod 'CryptoSwift'
pod 'CryptoSwift', '1.5.1'
pod 'libPhoneNumber-iOS'
pod 'KVOController'
pod 'SimpleKeychain', '~> 0.12.5'
70 changes: 35 additions & 35 deletions dydx/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Abacus (1.0.8)
- Abacus (1.0.20)
- Amplitude-iOS (4.10.0)
- AppsFlyerFramework (6.12.2):
- AppsFlyerFramework/Main (= 6.12.2)
@@ -14,7 +14,7 @@ PODS:
- CocoaLumberjack/Core (3.8.2)
- CombineExt (1.8.0)
- COSTouchVisualizer (1.0.6)
- CryptoSwift (1.8.0)
- CryptoSwift (1.5.1)
- Differ (1.4.5)
- DrawerMenu (1.0.1)
- EasyTipView (2.1.0)
@@ -184,38 +184,38 @@ PODS:
- GoogleToolboxForMac/Defines (= 3.0.0)
- GoogleToolboxForMac/StringEncoding (3.0.0):
- GoogleToolboxForMac/Defines (= 3.0.0)
- GoogleUtilities (7.11.6):
- GoogleUtilities/AppDelegateSwizzler (= 7.11.6)
- GoogleUtilities/Environment (= 7.11.6)
- GoogleUtilities/ISASwizzler (= 7.11.6)
- GoogleUtilities/Logger (= 7.11.6)
- GoogleUtilities/MethodSwizzler (= 7.11.6)
- GoogleUtilities/Network (= 7.11.6)
- "GoogleUtilities/NSData+zlib (= 7.11.6)"
- GoogleUtilities/Reachability (= 7.11.6)
- GoogleUtilities/SwizzlerTestHelpers (= 7.11.6)
- GoogleUtilities/UserDefaults (= 7.11.6)
- GoogleUtilities/AppDelegateSwizzler (7.11.6):
- GoogleUtilities (7.12.0):
- GoogleUtilities/AppDelegateSwizzler (= 7.12.0)
- GoogleUtilities/Environment (= 7.12.0)
- GoogleUtilities/ISASwizzler (= 7.12.0)
- GoogleUtilities/Logger (= 7.12.0)
- GoogleUtilities/MethodSwizzler (= 7.12.0)
- GoogleUtilities/Network (= 7.12.0)
- "GoogleUtilities/NSData+zlib (= 7.12.0)"
- GoogleUtilities/Reachability (= 7.12.0)
- GoogleUtilities/SwizzlerTestHelpers (= 7.12.0)
- GoogleUtilities/UserDefaults (= 7.12.0)
- GoogleUtilities/AppDelegateSwizzler (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.11.6):
- GoogleUtilities/Environment (7.12.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/ISASwizzler (7.11.6)
- GoogleUtilities/Logger (7.11.6):
- GoogleUtilities/ISASwizzler (7.12.0)
- GoogleUtilities/Logger (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (7.11.6):
- GoogleUtilities/MethodSwizzler (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network (7.11.6):
- GoogleUtilities/Network (7.12.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.11.6)"
- GoogleUtilities/Reachability (7.11.6):
- "GoogleUtilities/NSData+zlib (7.12.0)"
- GoogleUtilities/Reachability (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/SwizzlerTestHelpers (7.11.6):
- GoogleUtilities/SwizzlerTestHelpers (7.12.0):
- GoogleUtilities/MethodSwizzler
- GoogleUtilities/UserDefaults (7.11.6):
- GoogleUtilities/UserDefaults (7.12.0):
- GoogleUtilities/Logger
- GTMSessionFetcher (3.1.1):
- GTMSessionFetcher/Full (= 3.1.1)
@@ -228,11 +228,11 @@ PODS:
- KVOController (1.2.0)
- libPhoneNumber-iOS (0.9.15)
- MaterialActivityIndicator (0.0.6)
- nanopb (2.30909.0):
- nanopb/decode (= 2.30909.0)
- nanopb/encode (= 2.30909.0)
- nanopb/decode (2.30909.0)
- nanopb/encode (2.30909.0)
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
- nanopb/decode (2.30909.1)
- nanopb/encode (2.30909.1)
- NVActivityIndicatorView (5.1.1):
- NVActivityIndicatorView/Base (= 5.1.1)
- NVActivityIndicatorView/Base (5.1.1)
@@ -268,7 +268,7 @@ DEPENDENCIES:
- Charts (from `https://github.com/dydxprotocol/Charts.git`, branch `releases/3.6.0.3`)
- CombineExt
- COSTouchVisualizer
- CryptoSwift
- CryptoSwift (= 1.5.1)
- Differ
- DrawerMenu
- EasyTipView
@@ -379,7 +379,7 @@ CHECKOUT OPTIONS:
:http: https://ios-releases.fullstory.com/fullstory-1.29.0-xcframework.tar.gz

SPEC CHECKSUMS:
Abacus: ab0887928564ae7d6f38cd232909e88f0e95f9d6
Abacus: 521cdee506e6efad5c3d04eb12b370466b10bbd1
Amplitude-iOS: 7d8cdc3408ba35c2e68368fc7c692cd104606b94
AppsFlyerFramework: 6eb4d89d2eb9a6632317f1055b359d9fd85fd5ff
Atributika: 0eabae2cc37999e79c5b94f60213642946991b1c
@@ -388,7 +388,7 @@ SPEC CHECKSUMS:
CocoaLumberjack: f8d89a516e7710fdb2e9b8f1560b16ec6040eef0
CombineExt: c4daa97ef75754d8ef319bd79edeef82652f3eea
COSTouchVisualizer: a398089327a6c02897823614d7447ccc97198997
CryptoSwift: 52aaf3fce7337552863b1d952e408085f0e65030
CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
Differ: 3b6bd78e2b20cc795d9a86f7641d087524e4273e
DrawerMenu: f6ca91901e2b21086e3c19bcca278d3d3127e85f
EasyTipView: a92b6edc377b81c5ac18e9fd35d5ee78e9409488
@@ -411,15 +411,15 @@ SPEC CHECKSUMS:
GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleToolboxForMac: 970a0066c5ac38b1bdd2abf94647fa7169ed1583
GoogleUtilities: 202e7a9f5128accd11160fb9c19612de1911aa19
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
iCarousel: d782f635afac190c49bb8ee455882284cff8b85f
JTCalendar: 1b326e0d59dd1855b52c5f3feb059d2ff953805d
KVOController: d72ace34afea42468329623b3379ab3cd1d286b6
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
MaterialActivityIndicator: 5061a52fadf7d22533734f2d34806311331bc424
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667
PanModal: 3e16ead1a907fb06f4df3f13492fd00149fa4974
pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
@@ -437,6 +437,6 @@ SPEC CHECKSUMS:
Validator: 80a6f567220c962dfd2d9928ae98a8c1d164f6f4
ZSWTappableLabel: 92f11d677bb395a8294df48482316c4981783ca0

PODFILE CHECKSUM: e1127920ba012c51c4cc4b646c839bf4bcd5b30b
PODFILE CHECKSUM: 6c6f8513dc35d0af8091105053d372bc13a66241

COCOAPODS: 1.13.0
COCOAPODS: 1.14.2
2 changes: 1 addition & 1 deletion dydx/Pods/CryptoSwift/LICENSE

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

Loading