Merge branch 'develop' into feature/network-selection-left-overs

Emurgo · Aug 2, 2024 · 993501f · 993501f
2 parents d57c48b + 4840ee6
commit 993501f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 9 deletions.
diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/WebViewItem.tsx b/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/WebViewItem.tsx
@@ -7,6 +7,7 @@ import WebView from 'react-native-webview'
 import {WebViewNavigation, WebViewNavigationEvent} from 'react-native-webview/lib/WebViewTypes'
 
 import {Icon, Spacer} from '../../../../components'
+import {isDev} from '../../../../kernel/env'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {TabItem, useBrowser} from '../../common/BrowserProvider'
 import {getDomainFromUrl} from '../../common/helpers'
@@ -109,6 +110,7 @@ export const WebViewItem = ({tab, index}: Props) => {
           {!tabsOpen && isTabActive && <BrowserToolbar uri={tab.url} />}
 
           <WebView
+            webviewDebuggingEnabled={isDev}
             originWhitelist={['*']}
             ref={webViewRef}
             androidLayerType="hardware"

diff --git a/...et-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx b/...et-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
@@ -203,7 +203,7 @@ const useStyles = () => {
     dAppLogo: {
       width: 40,
       height: 40,
-      resizeMode: 'contain',
+      contentFit: 'contain',
     },
     dAppLogoDialog: {
       width: 48,

diff --git a/...ils/PortfolioTokenInfo/Overview/index.tsx → .../PortfolioTokenInfo/Overview/Overview.tsx b/...ils/PortfolioTokenInfo/Overview/index.tsx → .../PortfolioTokenInfo/Overview/Overview.tsx
@@ -147,7 +147,6 @@ const useStyles = () => {
     tokenLogo: {
       width: 32,
       height: 32,
-      resizeMode: 'cover',
       ...atoms.rounded_sm,
     },
     textBody: {

diff --git a/...atures/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/PortfolioTokenInfo.tsx b/...atures/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/PortfolioTokenInfo.tsx
@@ -4,7 +4,7 @@ import {StyleSheet, View} from 'react-native'
 
 import {TabPanel, TabPanels} from '../../../../../components/Tabs'
 import {usePortfolioTokenDetailContext} from '../../../common/PortfolioTokenDetailContext'
-import {Overview} from './Overview'
+import {Overview} from './Overview/Overview'
 import {Performance} from './Performance'
 
 export const PortfolioTokenInfo = () => {