Skip to content

Commit 5196784

Browse files
Jon-edgeJon-edge
authored
Merge pull request #5817 from EdgeApp/jon/modal-close
Jon/modal close
2 parents e189e3c + d84c9bc commit 5196784

14 files changed

+879
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- added: Include loginId's for all accounts when uploading logs.
88
- changed: Reduced number of views in `WalletListCurrencyRow`
99
- changed: Custom assets to show a generic grey icon, overlayed with the first three letters of the asset
10+
- changed: "X" button re-added to `EdgeModal` for accessibility
1011
- fixed: `AirshipToast` font scaling
1112
- fixed: Swap provider selection modal scrolling on Android
1213
- fixed: Incorrect `SendScene` fee text when there is no fee

‎src/__tests__/modals/__snapshots__/AccelerateTxModal.test.tsx.snap‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,73 @@ exports[`AccelerateTxModalComponent should render with loading props 1`] = `
210210
>
211211
Accelerate Transaction
212212
</Text>
213+
<View
214+
accessibilityState={
215+
{
216+
"busy": undefined,
217+
"checked": undefined,
218+
"disabled": false,
219+
"expanded": undefined,
220+
"selected": undefined,
221+
}
222+
}
223+
accessibilityValue={
224+
{
225+
"max": undefined,
226+
"min": undefined,
227+
"now": undefined,
228+
"text": undefined,
229+
}
230+
}
231+
accessible={true}
232+
collapsable={false}
233+
focusable={true}
234+
onClick={[Function]}
235+
onResponderGrant={[Function]}
236+
onResponderMove={[Function]}
237+
onResponderRelease={[Function]}
238+
onResponderTerminate={[Function]}
239+
onResponderTerminationRequest={[Function]}
240+
onStartShouldSetResponder={[Function]}
241+
style={
242+
{
243+
"alignItems": "flex-end",
244+
"alignSelf": "flex-start",
245+
"flexGrow": 1,
246+
"justifyContent": "flex-start",
247+
"marginBottom": -17,
248+
"marginRight": -22,
249+
"marginTop": -22,
250+
"opacity": 1,
251+
"paddingBottom": 17,
252+
"paddingRight": 28,
253+
"paddingTop": 26,
254+
}
255+
}
256+
testID="modal-close-button"
257+
>
258+
<Text
259+
allowFontScaling={false}
260+
selectable={false}
261+
style={
262+
[
263+
{
264+
"color": "#888888",
265+
"fontSize": 28,
266+
},
267+
undefined,
268+
{
269+
"fontFamily": "anticon",
270+
"fontStyle": "normal",
271+
"fontWeight": "normal",
272+
},
273+
{},
274+
]
275+
}
276+
>
277+
278+
</Text>
279+
</View>
213280
</View>
214281
<Text
215282
adjustsFontSizeToFit={false}

‎src/__tests__/modals/__snapshots__/AddressModal.test.tsx.snap‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,73 @@ exports[`AddressModalComponent should render with loaded props 1`] = `
210210
>
211211
string
212212
</Text>
213+
<View
214+
accessibilityState={
215+
{
216+
"busy": undefined,
217+
"checked": undefined,
218+
"disabled": false,
219+
"expanded": undefined,
220+
"selected": undefined,
221+
}
222+
}
223+
accessibilityValue={
224+
{
225+
"max": undefined,
226+
"min": undefined,
227+
"now": undefined,
228+
"text": undefined,
229+
}
230+
}
231+
accessible={true}
232+
collapsable={false}
233+
focusable={true}
234+
onClick={[Function]}
235+
onResponderGrant={[Function]}
236+
onResponderMove={[Function]}
237+
onResponderRelease={[Function]}
238+
onResponderTerminate={[Function]}
239+
onResponderTerminationRequest={[Function]}
240+
onStartShouldSetResponder={[Function]}
241+
style={
242+
{
243+
"alignItems": "flex-end",
244+
"alignSelf": "flex-start",
245+
"flexGrow": 1,
246+
"justifyContent": "flex-start",
247+
"marginBottom": -17,
248+
"marginRight": -22,
249+
"marginTop": -22,
250+
"opacity": 1,
251+
"paddingBottom": 17,
252+
"paddingRight": 28,
253+
"paddingTop": 26,
254+
}
255+
}
256+
testID="modal-close-button"
257+
>
258+
<Text
259+
allowFontScaling={false}
260+
selectable={false}
261+
style={
262+
[
263+
{
264+
"color": "#888888",
265+
"fontSize": 28,
266+
},
267+
undefined,
268+
{
269+
"fontFamily": "anticon",
270+
"fontStyle": "normal",
271+
"fontWeight": "normal",
272+
},
273+
{},
274+
]
275+
}
276+
>
277+
278+
</Text>
279+
</View>
213280
</View>
214281
<View
215282
marginRemStyle={

‎src/__tests__/modals/__snapshots__/AutoLogoutModal.test.tsx.snap‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,73 @@ exports[`AutoLogoutModal should render with loading props 1`] = `
210210
>
211211
Set Auto Logoff time
212212
</Text>
213+
<View
214+
accessibilityState={
215+
{
216+
"busy": undefined,
217+
"checked": undefined,
218+
"disabled": false,
219+
"expanded": undefined,
220+
"selected": undefined,
221+
}
222+
}
223+
accessibilityValue={
224+
{
225+
"max": undefined,
226+
"min": undefined,
227+
"now": undefined,
228+
"text": undefined,
229+
}
230+
}
231+
accessible={true}
232+
collapsable={false}
233+
focusable={true}
234+
onClick={[Function]}
235+
onResponderGrant={[Function]}
236+
onResponderMove={[Function]}
237+
onResponderRelease={[Function]}
238+
onResponderTerminate={[Function]}
239+
onResponderTerminationRequest={[Function]}
240+
onStartShouldSetResponder={[Function]}
241+
style={
242+
{
243+
"alignItems": "flex-end",
244+
"alignSelf": "flex-start",
245+
"flexGrow": 1,
246+
"justifyContent": "flex-start",
247+
"marginBottom": -17,
248+
"marginRight": -22,
249+
"marginTop": -22,
250+
"opacity": 1,
251+
"paddingBottom": 17,
252+
"paddingRight": 28,
253+
"paddingTop": 26,
254+
}
255+
}
256+
testID="modal-close-button"
257+
>
258+
<Text
259+
allowFontScaling={false}
260+
selectable={false}
261+
style={
262+
[
263+
{
264+
"color": "#888888",
265+
"fontSize": 28,
266+
},
267+
undefined,
268+
{
269+
"fontFamily": "anticon",
270+
"fontStyle": "normal",
271+
"fontWeight": "normal",
272+
},
273+
{},
274+
]
275+
}
276+
>
277+
278+
</Text>
279+
</View>
213280
</View>
214281
<View
215282
style={

‎src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,73 @@ exports[`CategoryModal should render with a subcategory 1`] = `
210210
>
211211
Choose a Category
212212
</Text>
213+
<View
214+
accessibilityState={
215+
{
216+
"busy": undefined,
217+
"checked": undefined,
218+
"disabled": false,
219+
"expanded": undefined,
220+
"selected": undefined,
221+
}
222+
}
223+
accessibilityValue={
224+
{
225+
"max": undefined,
226+
"min": undefined,
227+
"now": undefined,
228+
"text": undefined,
229+
}
230+
}
231+
accessible={true}
232+
collapsable={false}
233+
focusable={true}
234+
onClick={[Function]}
235+
onResponderGrant={[Function]}
236+
onResponderMove={[Function]}
237+
onResponderRelease={[Function]}
238+
onResponderTerminate={[Function]}
239+
onResponderTerminationRequest={[Function]}
240+
onStartShouldSetResponder={[Function]}
241+
style={
242+
{
243+
"alignItems": "flex-end",
244+
"alignSelf": "flex-start",
245+
"flexGrow": 1,
246+
"justifyContent": "flex-start",
247+
"marginBottom": -17,
248+
"marginRight": -22,
249+
"marginTop": -22,
250+
"opacity": 1,
251+
"paddingBottom": 17,
252+
"paddingRight": 28,
253+
"paddingTop": 26,
254+
}
255+
}
256+
testID="modal-close-button"
257+
>
258+
<Text
259+
allowFontScaling={false}
260+
selectable={false}
261+
style={
262+
[
263+
{
264+
"color": "#888888",
265+
"fontSize": 28,
266+
},
267+
undefined,
268+
{
269+
"fontFamily": "anticon",
270+
"fontStyle": "normal",
271+
"fontWeight": "normal",
272+
},
273+
{},
274+
]
275+
}
276+
>
277+
278+
</Text>
279+
</View>
213280
</View>
214281
<View
215282
style={
@@ -1854,6 +1921,73 @@ exports[`CategoryModal should render with an empty subcategory 1`] = `
18541921
>
18551922
Choose a Category
18561923
</Text>
1924+
<View
1925+
accessibilityState={
1926+
{
1927+
"busy": undefined,
1928+
"checked": undefined,
1929+
"disabled": false,
1930+
"expanded": undefined,
1931+
"selected": undefined,
1932+
}
1933+
}
1934+
accessibilityValue={
1935+
{
1936+
"max": undefined,
1937+
"min": undefined,
1938+
"now": undefined,
1939+
"text": undefined,
1940+
}
1941+
}
1942+
accessible={true}
1943+
collapsable={false}
1944+
focusable={true}
1945+
onClick={[Function]}
1946+
onResponderGrant={[Function]}
1947+
onResponderMove={[Function]}
1948+
onResponderRelease={[Function]}
1949+
onResponderTerminate={[Function]}
1950+
onResponderTerminationRequest={[Function]}
1951+
onStartShouldSetResponder={[Function]}
1952+
style={
1953+
{
1954+
"alignItems": "flex-end",
1955+
"alignSelf": "flex-start",
1956+
"flexGrow": 1,
1957+
"justifyContent": "flex-start",
1958+
"marginBottom": -17,
1959+
"marginRight": -22,
1960+
"marginTop": -22,
1961+
"opacity": 1,
1962+
"paddingBottom": 17,
1963+
"paddingRight": 28,
1964+
"paddingTop": 26,
1965+
}
1966+
}
1967+
testID="modal-close-button"
1968+
>
1969+
<Text
1970+
allowFontScaling={false}
1971+
selectable={false}
1972+
style={
1973+
[
1974+
{
1975+
"color": "#888888",
1976+
"fontSize": 28,
1977+
},
1978+
undefined,
1979+
{
1980+
"fontFamily": "anticon",
1981+
"fontStyle": "normal",
1982+
"fontWeight": "normal",
1983+
},
1984+
{},
1985+
]
1986+
}
1987+
>
1988+
1989+
</Text>
1990+
</View>
18571991
</View>
18581992
<View
18591993
style={

0 commit comments

Comments
 (0)