fixup! Overlay styling for "Wallet Paused"

EdgeApp · Oct 20, 2023 · 2090738 · 2090738
1 parent 5d6fcc1
commit 2090738
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/src/components/themed/WalletListCurrencyRow.tsx b/src/components/themed/WalletListCurrencyRow.tsx
@@ -55,6 +55,11 @@ const WalletListCurrencyRowComponent = (props: Props) => {
 
   return (
     <TouchableOpacity accessible={false} style={styles.row} onLongPress={handleLongPress} onPress={handlePress}>
+      {customAsset != null ? (
+        <CustomAssetRow customAsset={customAsset} />
+      ) : (
+        <CurrencyRow showRate={showRate && !isPaused} token={token} tokenId={tokenId} wallet={wallet} />
+      )}
       {isPaused ? (
         <>
           <View style={styles.overlayLabelContainer}>
@@ -63,11 +68,6 @@ const WalletListCurrencyRowComponent = (props: Props) => {
           <View style={styles.overlayContainer} />
         </>
       ) : null}
-      {customAsset != null ? (
-        <CustomAssetRow customAsset={customAsset} />
-      ) : (
-        <CurrencyRow showRate={showRate && !isPaused} token={token} tokenId={tokenId} wallet={wallet} />
-      )}
     </TouchableOpacity>
   )
 }
@@ -79,15 +79,11 @@ const getStyles = cacheStyles((theme: Theme) => ({
   overlayLabelContainer: {
     ...StyleSheet.absoluteFillObject,
     alignItems: 'center',
-    display: 'flex',
-    justifyContent: 'center',
-    zIndex: 2
+    justifyContent: 'center'
   },
   overlayContainer: {
     ...StyleSheet.absoluteFillObject,
-    backgroundColor: theme.overlayDisabledColor,
-    opacity: theme.overlayDisabledOpacity,
-    zIndex: 1
+    backgroundColor: theme.overlayDisabledColor
   },
   row: {
     alignItems: 'center',

diff --git a/src/theme/variables/edgeDark.ts b/src/theme/variables/edgeDark.ts
@@ -329,8 +329,7 @@ export const edgeDark: Theme = {
   underlayOpacity: 0.95,
 
   // TouchableHighlights overlay
-  overlayDisabledColor: palette.black,
-  overlayDisabledOpacity: 0.5,
+  overlayDisabledColor: palette.blackOp50,
   overlayDisabledTextColor: palette.white,
 
   // Tutorials

diff --git a/src/theme/variables/edgeLight.ts b/src/theme/variables/edgeLight.ts
@@ -329,8 +329,7 @@ export const edgeLight: Theme = {
   underlayOpacity: 0.95,
 
   // TouchableHighlights overlay
-  overlayDisabledColor: palette.black,
-  overlayDisabledOpacity: 0.5,
+  overlayDisabledColor: palette.blackOp50,
   overlayDisabledTextColor: palette.white,
 
   // Tutorials

diff --git a/src/types/Theme.ts b/src/types/Theme.ts
@@ -330,7 +330,6 @@ export interface Theme {
 
   // TouchableHighlights overlay
   overlayDisabledColor: string
-  overlayDisabledOpacity: number
   overlayDisabledTextColor: string
 
   // Tutorials