Skip to content

Commit 2f7d16c

Browse files
ci(release): publish latest release
1 parent ca10b1c commit 2f7d16c

File tree

662 files changed

+7845
-4796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

662 files changed

+7845
-4796
lines changed

.yarn/patches/react-native-wagmi-charts-npm-2.5.1-c9e2637be7.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.

RELEASE

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IPFS hash of the deployment:
2-
- CIDv0: `Qmcit8DbnQtQk8ZzSa9E4PFXjU1ENfbMQXYv5VwfNLvF1N`
3-
- CIDv1: `bafybeigvwwif77wmthgzo7xqqnjpxbqfsodjbwg3mafmnrwtcojewqpveu`
2+
- CIDv0: `QmW47HPC4SPLcqU9J19iTWNzjsqyaTmbUyhxUyNLcPNqhu`
3+
- CIDv1: `bafybeidsucvs434zirxhib6npfzfqg4jagv6xkccfxjz3gmegib2bu36zq`
44

55
The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
66

@@ -10,15 +10,49 @@ You can also access the Uniswap Interface from an IPFS gateway.
1010
Your Uniswap settings are never remembered across different URLs.
1111

1212
IPFS gateways:
13-
- https://bafybeigvwwif77wmthgzo7xqqnjpxbqfsodjbwg3mafmnrwtcojewqpveu.ipfs.dweb.link/
14-
- https://bafybeigvwwif77wmthgzo7xqqnjpxbqfsodjbwg3mafmnrwtcojewqpveu.ipfs.cf-ipfs.com/
15-
- [ipfs://Qmcit8DbnQtQk8ZzSa9E4PFXjU1ENfbMQXYv5VwfNLvF1N/](ipfs://Qmcit8DbnQtQk8ZzSa9E4PFXjU1ENfbMQXYv5VwfNLvF1N/)
13+
- https://bafybeidsucvs434zirxhib6npfzfqg4jagv6xkccfxjz3gmegib2bu36zq.ipfs.dweb.link/
14+
- https://bafybeidsucvs434zirxhib6npfzfqg4jagv6xkccfxjz3gmegib2bu36zq.ipfs.cf-ipfs.com/
15+
- [ipfs://QmW47HPC4SPLcqU9J19iTWNzjsqyaTmbUyhxUyNLcPNqhu/](ipfs://QmW47HPC4SPLcqU9J19iTWNzjsqyaTmbUyhxUyNLcPNqhu/)
1616

17-
### 5.36.3 (2024-06-26)
17+
## 5.37.0 (2024-06-26)
18+
19+
20+
### Features
21+
22+
* **web:** add fiat currency selection to buy flow (#8868) 25d35a7
23+
* **web:** country picker for buy flow (+ tests/snapshots) (#8825) a342a3a
24+
* **web:** Enable Avax on /explore (#8965) c9f8ed5
25+
* **web:** move BaseCard and dependencies to uniswap (#9084) 61c6c15
1826

1927

2028
### Bug Fixes
2129

22-
* **web:** legacy nav should not transition out of view on scroll (#9538) 435b634
30+
* **web:** Divide 1 day APR by 100 (#9343) 838a3c7
31+
* **web:** ensure explore and pools tabs are highlighted when active (#9151) 63673b1
32+
* **web:** fix a few translations where components need a tag for inte… (#9152) cfe7ed5
33+
* **web:** fix broken link, translation, and importing v2 positions (#9543) 51335c2
34+
* **web:** fix height of token safety modal (#9258) f8bb7f4
35+
* **web:** fix moonpay modal height (#9270) ce92266
36+
* **web:** ignore GQL errors in SearchTokens query (#9544) e687bd0
37+
* **web:** language/currency label (#9158) af0c676
38+
* **web:** legacy nav should not transition out of view on scroll (#9540) 1ae4664
39+
* **web:** reconcile multichainUx with refreshedNavbar (#9122) 6519f2c
40+
* **web:** unblock ENS namewrapper contract address (#9254) 050fe29
41+
* **web:** update redux store to v12 to match migrations (#8844) a9c162b
42+
* **web:** use Add/Remove language in Transactions table (#9133) f78bb31
43+
* **web:** use nullable valueModifiers (#9268) 8ccdf1c
44+
* **web:** use uniswapx-sdk for cancel limits params (#8912) 83d70ab
45+
* **web:** use valueModifiers in web portfolio query (#8942) ff5a840
46+
* **web:** web config (#9169) 39c336a
47+
48+
49+
### Reverts
50+
51+
* **web:** place hotkeys under feature flag for nav release (#9196) c1fff38
52+
53+
54+
### Continuous Integration
55+
56+
* **web:** update sitemaps be4b927
2357

2458

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web/5.36.3
1+
web/5.37.0

apps/mobile/ios/Modifiers.swift

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
//
2+
// RelativeOffsetView.swift
3+
// Uniswap
4+
//
5+
// Created by Mateusz Łopaciński on 18/06/2024.
6+
//
7+
8+
import SwiftUI
9+
10+
struct RelativeOffsetView<Content: View>: View {
11+
var x: CGFloat
12+
var y: CGFloat
13+
var onOffsetCalculated: (CGFloat, CGFloat) -> Void
14+
var content: Content
15+
16+
@State private var contentSize: CGSize = .zero
17+
18+
init(x: CGFloat = 0, y: CGFloat = 0, onOffsetCalculated: @escaping (CGFloat, CGFloat) -> Void = { _, _ in }, @ViewBuilder content: () -> Content) {
19+
self.x = x
20+
self.y = y
21+
self.onOffsetCalculated = onOffsetCalculated
22+
self.content = content()
23+
}
24+
25+
var body: some View {
26+
content
27+
.background(
28+
GeometryReader { geometry in
29+
Color.clear
30+
.onAppear {
31+
let offsetX = x * geometry.size.width
32+
let offsetY = y * geometry.size.height
33+
contentSize = geometry.size
34+
onOffsetCalculated(offsetX, offsetY)
35+
}
36+
.onChange(of: geometry.size) { newSize in
37+
let offsetX = x * newSize.width
38+
let offsetY = y * newSize.height
39+
contentSize = newSize
40+
onOffsetCalculated(offsetX, offsetY)
41+
}
42+
}
43+
)
44+
.offset(x: x * contentSize.width, y: y * contentSize.height)
45+
}
46+
}

apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
00E356F31AD99517003FC87E /* UniswapTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* UniswapTests.m */; };
1212
037C5AAA2C04970B00B1D808 /* CopyIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 037C5AA92C04970B00B1D808 /* CopyIcon.swift */; };
1313
03C788232C10E7390011E5DC /* ActionButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C788222C10E7390011E5DC /* ActionButtons.swift */; };
14-
03C788252C10F2810011E5DC /* Modifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C788242C10F2810011E5DC /* Modifiers.swift */; };
14+
03D2F3182C218D390030D987 /* RelativeOffsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D2F3172C218D380030D987 /* RelativeOffsetView.swift */; };
1515
0703EE032A5734A600AED1DA /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0703EE022A5734A600AED1DA /* UserDefaults.swift */; };
1616
0703EE052A57351800AED1DA /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 072F6C372A44BECC00DA720A /* Logging.swift */; };
1717
072E238E2A44D5BD006AD6C9 /* WidgetsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 072E23862A44D5BC006AD6C9 /* WidgetsCore.framework */; };
@@ -304,7 +304,7 @@
304304
00E356F21AD99517003FC87E /* UniswapTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UniswapTests.m; sourceTree = "<group>"; };
305305
037C5AA92C04970B00B1D808 /* CopyIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyIcon.swift; sourceTree = "<group>"; };
306306
03C788222C10E7390011E5DC /* ActionButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionButtons.swift; sourceTree = "<group>"; };
307-
03C788242C10F2810011E5DC /* Modifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modifiers.swift; sourceTree = "<group>"; };
307+
03D2F3172C218D380030D987 /* RelativeOffsetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelativeOffsetView.swift; sourceTree = "<group>"; };
308308
065A981F892F7A06A900FCD5 /* Pods-WidgetsCoreTests.dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WidgetsCoreTests.dev.xcconfig"; path = "Target Support Files/Pods-WidgetsCoreTests/Pods-WidgetsCoreTests.dev.xcconfig"; sourceTree = "<group>"; };
309309
0703EE022A5734A600AED1DA /* UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults.swift; sourceTree = "<group>"; };
310310
070480372A58A507009006CE /* WidgetIntentExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetIntentExtension.entitlements; sourceTree = "<group>"; };
@@ -623,6 +623,7 @@
623623
isa = PBXGroup;
624624
children = (
625625
03C788222C10E7390011E5DC /* ActionButtons.swift */,
626+
03D2F3172C218D380030D987 /* RelativeOffsetView.swift */,
626627
);
627628
path = Shared;
628629
sourceTree = "<group>";
@@ -925,7 +926,6 @@
925926
BF9176E944C84910B1C0B057 /* SplashScreen.storyboard */,
926927
FD7304CD28A364FC0085BDEA /* Colors.xcassets */,
927928
FD7304CF28A3650A0085BDEA /* Colors.swift */,
928-
03C788242C10F2810011E5DC /* Modifiers.swift */,
929929
);
930930
name = Uniswap;
931931
sourceTree = "<group>";
@@ -1996,7 +1996,7 @@
19961996
6BC7D0802B5FF02400617C95 /* EncryptionUtils.swift in Sources */,
19971997
03C788232C10E7390011E5DC /* ActionButtons.swift in Sources */,
19981998
8EA8AB3B2AB7ED3C004E7EF3 /* SeedPhraseInputManager.m in Sources */,
1999-
03C788252C10F2810011E5DC /* Modifiers.swift in Sources */,
1999+
03D2F3182C218D390030D987 /* RelativeOffsetView.swift in Sources */,
20002000
6CA91BDB2A95223C00C4063E /* RNEthersRS.swift in Sources */,
20012001
8EA8AB3C2AB7ED3C004E7EF3 /* SeedPhraseInputViewModel.swift in Sources */,
20022002
072F6C2E2A44A32F00DA720A /* TokenPriceWidget.intentdefinition in Sources */,

apps/mobile/ios/Uniswap/Icons/AlertTriangleIcon.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import SwiftUI
99

10-
struct AlertTriangeIcon: Shape {
10+
struct AlertTriangleIcon: Shape {
1111
func path(in rect: CGRect) -> Path {
1212
var path = Path()
1313
let width = rect.size.width

apps/mobile/ios/Uniswap/Onboarding/Backup/MnemonicDisplayView.swift

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,17 @@ struct MnemonicDisplay: View {
110110
.overlay(
111111
HStack {
112112
Spacer()
113-
CopyButton(
114-
copyButtonText: props.copyText,
115-
copiedButtonText: props.copiedText,
116-
textToCopy: props.mnemonicWords.joined(separator: " ")
117-
)
118-
Spacer()
119-
}
120-
.relativeOffset(y: -0.5) { _, offsetY in
113+
RelativeOffsetView(y: -0.5, onOffsetCalculated: { _, offsetY in
121114
buttonPadding = abs(offsetY)
122-
},
115+
}) {
116+
CopyButton(
117+
copyButtonText: props.copyText,
118+
copiedButtonText: props.copiedText,
119+
textToCopy: props.mnemonicWords.joined(separator: " ")
120+
)
121+
}
122+
Spacer()
123+
},
123124
alignment: .top
124125
)
125126
}

apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputView.swift

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ struct SeedPhraseInput: View {
122122
if (viewModel.input.isEmpty) {
123123
Text(viewModel.strings.inputPlaceholder)
124124
.font(subtitleFont)
125+
.padding(.horizontal, 6)
126+
.padding(.vertical, 8)
125127
.foregroundColor(Colors.neutral3)
128+
.allowsHitTesting(false) // Prevents capturing touch events by the placeholder instead of input
126129
}
127130
}
128131
.fixedSize(horizontal: false, vertical: true)
@@ -148,13 +151,14 @@ struct SeedPhraseInput: View {
148151
if viewModel.input.isEmpty {
149152
HStack {
150153
Spacer()
151-
PasteButton(
152-
pasteButtonText: viewModel.strings.pasteButton,
153-
onPaste: handlePastePress
154-
)
154+
RelativeOffsetView(y: 0.5) {
155+
PasteButton(
156+
pasteButtonText: viewModel.strings.pasteButton,
157+
onPaste: handlePastePress
158+
)
159+
}
155160
Spacer()
156161
}
157-
.relativeOffset(y: 0.5)
158162
}
159163
},
160164
alignment: .bottom
@@ -163,7 +167,7 @@ struct SeedPhraseInput: View {
163167

164168
if (errorMessage() != nil) {
165169
HStack(spacing: 4) {
166-
AlertTriangeIcon()
170+
AlertTriangleIcon()
167171
.frame(width: 14, height: 14)
168172
.foregroundColor(Colors.statusCritical)
169173
Text(errorMessage() ?? "")

apps/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"react-native-svg": "15.1.0",
138138
"react-native-tab-view": "3.5.2",
139139
"react-native-url-polyfill": "1.3.0",
140-
"react-native-wagmi-charts": "2.5.1",
140+
"react-native-wagmi-charts": "2.5.2",
141141
"react-native-webview": "11.23.1",
142142
"react-native-widgetkit": "1.0.9",
143143
"react-redux": "8.0.5",

0 commit comments

Comments
 (0)