Merge upstream/master; fix Language spec and backdoor opacity

- Resolve modify/delete conflict: keep shroud.spec.js deleted (superseded by new specs)
- Drop Language step from 06-settings.spec.js (screen removed upstream)
- Fix SkipVerifyBackdoor opacity 0 → 0.01 so iOS XCUITest hittability check passes

Author: chaitika

BUILD.md

@@ -86,6 +86,12 @@ npm start
 
 Open ios/Shroud.xcworkspace. Once the project loads, select the scheme/target Shroud. Click Run.
 
+* To generate the debug APK:
+
+```bash
+bash scripts/build-debug-apk.sh
+```
+
 ## TESTS
 
 ```bash

README.md

@@ -3,7 +3,6 @@ import React, { forwardRef } from 'react';
 import { Dimensions, Platform, Pressable, StyleSheet, TextInput, View } from 'react-native';
 import { Icon, Text } from '@rneui/themed';
 import { useTheme } from './components/themes';
-import { useLocale } from '@react-navigation/native';
 
 const { height, width } = Dimensions.get('window');
 const aspectRatio = height / width;
@@ -39,11 +38,9 @@ export const ShroudCard = props => {
 
 export const ShroudText = ({ bold = false, ...props }) => {
   const { colors } = useTheme();
-  const { direction } = useLocale();
   const style = StyleSheet.compose(
     {
       color: colors.foregroundColor,
-      writingDirection: direction,
       fontWeight: bold ? 'bold' : 'normal',
     },
     props.style,
@@ -58,7 +55,6 @@ export const ShroudTextCentered = props => {
 
 export const ShroudFormLabel = props => {
   const { colors } = useTheme();
-  const { direction } = useLocale();
 
   return (
     <Text
@@ -67,7 +63,6 @@ export const ShroudFormLabel = props => {
         color: colors.foregroundColor,
         fontWeight: '400',
         marginHorizontal: 20,
-        writingDirection: direction,
       }}
     />
   );

ShroudComponents.js

@@ -1,8 +1,6 @@
 const getLocales = () => [
-  // you can choose / add the locales you want
   { countryCode: 'US', languageTag: 'en-US', languageCode: 'en', isRTL: false },
-  { countryCode: 'FR', languageTag: 'fr-FR', languageCode: 'fr', isRTL: false },
 ];
-const getCurrencies = () => ['USD', 'EUR']; // can be empty array
+const getCurrencies = () => ['USD'];
 
 export { getLocales, getCurrencies };

__mocks__/react-native-localize.ts

@@ -69,7 +69,8 @@ class MainApplication : Application(), ReactApplication {
         registerReceiver(themeChangeReceiver, IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED))
 
         val sharedI18nUtilInstance = I18nUtil.getInstance()
-        sharedI18nUtilInstance.allowRTL(applicationContext, true)
+        sharedI18nUtilInstance.allowRTL(applicationContext, false)
+        sharedI18nUtilInstance.forceRTL(applicationContext, false)
         SoLoader.init(this, OpenSourceMergedSoMapping)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.

android/app/src/main/java/org/bitshala/shroud/MainApplication.kt

@@ -425,6 +425,33 @@ export class HDSilentPaymentsWallet extends HDTaprootWallet {
     }
   }
 
+  async scanByTxid(txid: string): Promise<{ found: boolean; utxosFound: number; blockHeight: number; tipHeight: number }> {
+    const indexer = getDefaultIndexer();
+    const [response, tipResponse] = await Promise.all([indexer.getTransactionByTxid(txid), indexer.getLatestBlockHeight()]);
+    const tx = response.transaction;
+
+    const result = await this.processTransactions([tx]);
+
+    let newlyAdded = false;
+    for (const utxo of result.utxos) {
+      if (this.addUTXO(utxo)) {
+        newlyAdded = true;
+      }
+    }
+
+    if (newlyAdded) {
+      this.onBalanceChangeCallback?.();
+      this.onPersistCallback?.();
+    }
+
+    return {
+      found: result.utxos.length > 0,
+      utxosFound: result.utxos.length,
+      blockHeight: tx.blockHeight,
+      tipHeight: tipResponse.height,
+    };
+  }
+
   async fetchUtxo(): Promise<void> {
     const spUtxos = this.getSilentPaymentUTXOs();
 

class/wallets/hd-bip352-wallet.ts

@@ -1,4 +1,3 @@
-import AsyncStorage from '@react-native-async-storage/async-storage';
 import { BLOCK_EXPLORERS, getBlockExplorerUrl, saveBlockExplorer, BlockExplorer, normalizeUrl } from '../../models/blockExplorer';
 import * as Electrum from '../../modules/Electrum';
 import React, { createContext, useCallback, useEffect, useMemo, useState } from 'react';
@@ -7,7 +6,7 @@ import { isReadClipboardAllowed, setReadClipboardAllowed } from '../../modules/c
 import { getPreferredCurrency, GROUP_IO_SHROUD, initCurrencyDaemon, setPreferredCurrency } from '../../modules/currency';
 import { clearUseURv1, isURv1Enabled, setUseURv1 } from '../../modules/ur';
 import { ShroudApp } from '../../class';
-import { saveLanguage, STORAGE_KEY } from '../../loc';
+
 import { FiatUnit, TFiatUnit } from '../../models/fiatUnit';
 import {
   getEnabled as getIsDeviceQuickActionsEnabled,
@@ -75,8 +74,6 @@ export const getTotalBalancePreferredUnit = async (): Promise<BitcoinUnit> => {
 interface SettingsContextType {
   preferredFiatCurrency: TFiatUnit;
   setPreferredFiatCurrencyStorage: (currency: TFiatUnit) => Promise<void>;
-  language: string;
-  setLanguageStorage: (language: string) => Promise<void>;
   isPrivacyBlurEnabled: boolean;
   setIsPrivacyBlurEnabled: (value: boolean) => void;
   isDoNotTrackEnabled: boolean;
@@ -100,8 +97,6 @@ interface SettingsContextType {
 const defaultSettingsContext: SettingsContextType = {
   preferredFiatCurrency: FiatUnit.USD,
   setPreferredFiatCurrencyStorage: async () => {},
-  language: 'en',
-  setLanguageStorage: async () => {},
   isPrivacyBlurEnabled: true,
   setIsPrivacyBlurEnabled: () => {},
   isDoNotTrackEnabled: false,
@@ -126,7 +121,6 @@ export const SettingsContext = createContext<SettingsContextType>(defaultSetting
 
 export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.memo(({ children }: { children: React.ReactNode }) => {
   const [preferredFiatCurrency, setPreferredFiatCurrencyState] = useState<TFiatUnit>(FiatUnit.USD);
-  const [language, setLanguage] = useState<string>('en');
   const [isPrivacyBlurEnabled, setIsPrivacyBlurEnabled] = useState<boolean>(true);
   const [isDoNotTrackEnabled, setIsDoNotTrackEnabled] = useState<boolean>(false);
   const [isLegacyURv1Enabled, setIsLegacyURv1Enabled] = useState<boolean>(false);
@@ -151,9 +145,6 @@ export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.m
         Electrum.isDisabled().then(disabled => {
           setIsElectrumDisabled(disabled);
         }),
-        AsyncStorage.getItem(STORAGE_KEY).then(lang => {
-          setLanguage(lang ?? 'en');
-        }),
         isURv1Enabled().then(urv1Enabled => {
           setIsLegacyURv1Enabled(urv1Enabled);
         }),
@@ -217,15 +208,6 @@ export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.m
     }
   }, []);
 
-  const setLanguageStorage = useCallback(async (newLanguage: string): Promise<void> => {
-    try {
-      await saveLanguage(newLanguage);
-      setLanguage(newLanguage);
-    } catch (e) {
-      console.error('Error setting language:', e);
-    }
-  }, []);
-
   const setDoNotTrackStorage = useCallback(async (value: boolean): Promise<void> => {
     try {
       await DefaultPreference.setName(GROUP_IO_SHROUD);
@@ -305,8 +287,6 @@ export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.m
     () => ({
       preferredFiatCurrency,
       setPreferredFiatCurrencyStorage,
-      language,
-      setLanguageStorage,
       isPrivacyBlurEnabled,
       setIsPrivacyBlurEnabled,
       isDoNotTrackEnabled,
@@ -329,8 +309,6 @@ export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.m
     [
       preferredFiatCurrency,
       setPreferredFiatCurrencyStorage,
-      language,
-      setLanguageStorage,
       isPrivacyBlurEnabled,
       setIsPrivacyBlurEnabled,
       isDoNotTrackEnabled,

components/Context/SettingsProvider.tsx

@@ -1,8 +1,6 @@
 import React, { useMemo } from 'react';
 import { ActivityIndicator, Pressable, PressableProps, StyleSheet, Switch, TouchableOpacity, View } from 'react-native';
 import { Avatar, ListItem as RNElementsListItem, Button } from '@rneui/themed'; // Replace with actual import paths
-import { useLocale } from '@react-navigation/native';
-
 import { useTheme } from './themes';
 
 // Update the type for the props
@@ -87,17 +85,14 @@ const ListItem: React.FC<ListItemProps> = React.memo(
     swipeableRightContent,
   }: ListItemProps) => {
     const { colors } = useTheme();
-    const { direction } = useLocale();
     const stylesHook = StyleSheet.create({
       title: {
         color: disabled ? colors.buttonDisabledTextColor : colors.foregroundColor,
         fontSize: 16,
         fontWeight: '500',
-        writingDirection: direction,
       },
       subtitle: {
         flexWrap: 'wrap',
-        writingDirection: direction,
         color: colors.alternativeTextColor,
         fontWeight: '400',
         paddingVertical: switchProps ? 8 : 0,
@@ -154,7 +149,7 @@ const ListItem: React.FC<ListItemProps> = React.memo(
           <ActivityIndicator />
         ) : (
           <>
-            {chevron && <RNElementsListItem.Chevron iconStyle={{ transform: [{ scaleX: direction === 'rtl' ? -1 : 1 }] }} />}
+            {chevron && <RNElementsListItem.Chevron />}
             {rightIcon && <Avatar icon={rightIcon} />}
             {switchProps && (
               <Switch {...memoizedSwitchProps} accessibilityLabel={title} style={styles.margin16} accessible accessibilityRole="switch" />

components/ListItem.tsx

@@ -2,7 +2,6 @@ import React, { useCallback, useMemo } from 'react';
 import { Platform, TouchableOpacity } from 'react-native';
 import { MenuView, MenuAction, NativeActionEvent } from '@react-native-menu/menu';
 import { ToolTipMenuProps, Action } from './types';
-import { useSettings } from '../hooks/context/useSettings';
 
 const ToolTipMenu = (props: ToolTipMenuProps) => {
   const {
@@ -17,8 +16,6 @@ const ToolTipMenu = (props: ToolTipMenuProps) => {
     ...restProps
   } = props;
 
-  const { language } = useSettings();
-
   // Map Menu Items for RN Menu (supports subactions and displayInline)
   const mapMenuItemForMenuView = useCallback((action: Action): MenuAction | null => {
     if (!action.id) return null;
@@ -117,7 +114,7 @@ const ToolTipMenu = (props: ToolTipMenuProps) => {
         accessibilityLabel={props.accessibilityLabel}
         accessibilityHint={props.accessibilityHint}
         accessibilityRole={props.accessibilityRole}
-        accessibilityLanguage={language}
+        accessibilityLanguage="en"
       >
         {isMenuPrimaryAction || isButton ? (
           <TouchableOpacity style={buttonStyle} disabled={disabled} onPress={onPress} {...restProps}>

components/TooltipMenu.tsx

@@ -63,7 +63,7 @@ export const TransactionListItem: React.FC<TransactionListItemProps> = memo(
     const { navigate } = useExtendedNavigation<NavigationProps>();
     const menuRef = useRef<ToolTipMenuProps>();
     const { txMetadata } = useStorage();
-    const { language, selectedBlockExplorer } = useSettings();
+    const { selectedBlockExplorer } = useSettings();
     const insets = useSafeAreaInsets();
     const containerStyle = useMemo(
       () => ({
@@ -88,8 +88,7 @@ export const TransactionListItem: React.FC<TransactionListItemProps> = memo(
       } else {
         return transactionTimeToReadable(item.timestamp);
       }
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [relevantAddress, item.confirmations, item.timestamp, language]);
+    }, [relevantAddress, item.confirmations, item.timestamp]);
 
     const timeText = useMemo(() => {
       if (item.confirmations === 0) {
@@ -111,8 +110,7 @@ export const TransactionListItem: React.FC<TransactionListItemProps> = memo(
           return transactionTimeToReadable(item.timestamp);
         }
       }
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [item.confirmations, item.timestamp, language]);
+    }, [item.confirmations, item.timestamp]);
 
     const txMemo = txMetadata[item.hash]?.memo ?? '';
     const subtitle = useMemo(() => {