Skip to content

Commit 0ba81e9

Browse files
authored
style: fix formatting and disable scroll bounce in UI components (#144)
1 parent a652626 commit 0ba81e9

9 files changed

Lines changed: 15 additions & 8 deletions

File tree

app/(app)/logout.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ export default function Logout() {
1313
</>
1414
);
1515
}
16-

src/components/dashboard-webview/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ interface BridgeMessage {
3636

3737
interface DashboardWebViewProps extends Omit<WebViewProps, "onMessage"> {
3838
onMessage?: (event: WebViewMessageEvent) => void;
39+
scrollEnabled?: boolean;
3940
}
4041

4142
export const DashboardWebView = forwardRef<WebView, DashboardWebViewProps>(
42-
({ onMessage, ...webViewProps }, ref) => {
43+
({ onMessage, scrollEnabled = false, ...webViewProps }, ref) => {
4344
const webViewRef = useRef<WebView>(null);
4445
const [bridgeReady, setBridgeReady] = useState(false);
4546
const locale = useReactiveVar(localeVar);
@@ -93,6 +94,7 @@ export const DashboardWebView = forwardRef<WebView, DashboardWebViewProps>(
9394
onMessage={handleMessage}
9495
javaScriptEnabled={true}
9596
domStorageEnabled={true}
97+
scrollEnabled={scrollEnabled}
9698
/>
9799
);
98100
},

src/screens/ledger-screen/ledger-screen.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export const LedgerScreen = () => {
5757
<ProgressBar progress={progress} />
5858
<View style={styles.webViewContainer}>
5959
<DashboardWebView
60+
scrollEnabled={false}
6061
ref={(webView) => {
6162
webViewRef = webView;
6263
}}

src/screens/setting/about.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const About = () => {
1010
const theme = useTheme().colorTheme;
1111

1212
return (
13-
<ScrollView style={{ backgroundColor: theme.white }}>
13+
<ScrollView bounces={false} style={{ backgroundColor: theme.white }}>
1414
<AccountHeader />
1515
<InviteSection />
1616
<View style={{ paddingHorizontal: 16 }}>

src/translations/es.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ export const es: typeof en = {
2525
logoutAlertConfirm: "Cerrar sesión",
2626
logout: "Cerrar sesión",
2727
loggingOut: "Cerrando sesión",
28-
loggingOutMessage: "Por favor espera mientras cerramos tu sesión de forma segura...",
28+
loggingOutMessage:
29+
"Por favor espera mientras cerramos tu sesión de forma segura...",
2930
loggingOutProgress: "Cerrando sesión...",
3031
// delete account alert
3132
deleteAccountAlertMsg:

src/translations/fr.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ export const fr: typeof en = {
2525
logoutAlertConfirm: "Se déconnecter",
2626
logout: "Déconnexion",
2727
loggingOut: "Déconnexion en cours",
28-
loggingOutMessage: "Veuillez patienter pendant que nous vous déconnectons en toute sécurité...",
28+
loggingOutMessage:
29+
"Veuillez patienter pendant que nous vous déconnectons en toute sécurité...",
2930
loggingOutProgress: "Déconnexion...",
3031
// delete account alert
3132
deleteAccountAlertMsg:

src/translations/pt.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export const pt: typeof en = {
2424
logoutAlertConfirm: "Sair",
2525
logout: "Sair",
2626
loggingOut: "Saindo",
27-
loggingOutMessage: "Por favor, aguarde enquanto fazemos logout com segurança...",
27+
loggingOutMessage:
28+
"Por favor, aguarde enquanto fazemos logout com segurança...",
2829
loggingOutProgress: "Saindo...",
2930
// delete account alert
3031
deleteAccountAlertMsg:

src/translations/ru.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export const ru: typeof en = {
2424
logoutAlertConfirm: "Выйти",
2525
logout: "Выход",
2626
loggingOut: "Выход",
27-
loggingOutMessage: "Пожалуйста, подождите, пока мы безопасно выйдем из системы...",
27+
loggingOutMessage:
28+
"Пожалуйста, подождите, пока мы безопасно выйдем из системы...",
2829
loggingOutProgress: "Выход...",
2930
// delete account alert
3031
deleteAccountAlertMsg:

src/translations/uk.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export const uk: typeof en = {
2424
logoutAlertConfirm: "Вийти",
2525
logout: "Вихід",
2626
loggingOut: "Вихід",
27-
loggingOutMessage: "Будь ласка, зачекайте, поки ми безпечно вийдемо з системи...",
27+
loggingOutMessage:
28+
"Будь ласка, зачекайте, поки ми безпечно вийдемо з системи...",
2829
loggingOutProgress: "Вихід...",
2930
// delete account alert
3031
deleteAccountAlertMsg:

0 commit comments

Comments
 (0)