Merge pull request #4 from dydxprotocol/mike/trcl-3055-market-differe…

…nces-in-text-color-make-both-primary TRCL-3055 : Market: differences in text color? make both secondary
dydxprotocol · Nov 6, 2023 · 32f1f31 · 32f1f31
2 parents 6b7aab9 + 9568460
commit 32f1f31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md
@@ -1,4 +1,4 @@
-## Links
+## Links (dYdX Internal Use Only)
 Linear Ticket: _[Provide link to Linear ticket issue]_
 
 Figma Design: _[Provide link to Figma design here if applicable]_
@@ -20,9 +20,9 @@ _Provide a clear and concise description of the fix(es) or change(s) you made. I
 
 | Before | After |
 |--------|-------|
-| ![before image](url_here){: width="300px" } | ![after image](url_here){: width="300px" } |
+| <img src=""> | <img src=""> |
+| <video src=""> | <video src=""> |
 
-_**Note**: Replace `url_here` with the URL of your image and adjust `width` accordingly._
 
 
 
@@ -36,11 +36,3 @@ _**Note**: Replace `url_here` with the URL of your image and adjust `width` acco
 - [ ] Refactoring or Technical Debt
 - [ ] Documentation update
 - [ ] Other (please describe: )
-
-
-
-
-<br/>
-
-### Additional Comments (optional)
-Provide any additional comments or context about the changes here.
diff --git a/dydx/dydxViews/dydxViews/_v4/MarketInfo/Components/Resources/dydxMarketResourcesView.swift b/dydx/dydxViews/dydxViews/_v4/MarketInfo/Components/Resources/dydxMarketResourcesView.swift
@@ -83,13 +83,12 @@ public class dydxMarketResourcesViewModel: PlatformViewModel {
                                                    trailing: trailing.wrappedViewModel)
                         .createView(parentStyle: style)
 
-                    Text(sharedMarketViewModel.primaryDescription ?? "")
+                    Group {
+                        Text(sharedMarketViewModel.primaryDescription ?? "")
+                        Text(sharedMarketViewModel.secondaryDescription ?? "")
+                    }
                         .themeFont(fontSize: .medium)
-                        .padding(.vertical, 8)
-                        .padding(.horizontal, 16)
-                    Text(sharedMarketViewModel.secondaryDescription ?? "")
-                        .themeFont(fontSize: .medium)
-                        .themeColor(foreground: .textTertiary)
+                        .themeColor(foreground: .textSecondary)
                         .padding(.vertical, 8)
                         .padding(.horizontal, 16)
                 }