Merge remote-tracking branch 'upstream/master'

App.tsx

@@ -4,13 +4,12 @@ import { NavigationContainer } from '@react-navigation/native';
 import React from 'react';
 import { useColorScheme } from 'react-native';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
-
-import { BlueStorageProvider } from './blue_modules/storage-context';
 import { LargeScreenProvider } from './components/Context/LargeScreenProvider';
-import { SettingsProvider } from './components/Context/SettingsContext';
+import { SettingsProvider } from './components/Context/SettingsProvider';
 import { BlueDarkTheme, BlueDefaultTheme } from './components/themes';
 import MasterView from './navigation/MasterView';
 import { navigationRef } from './NavigationService';
+import { StorageProvider } from './components/Context/StorageProvider';
 
 const App = () => {
   const colorScheme = useColorScheme();
@@ -19,11 +18,11 @@ const App = () => {
     <LargeScreenProvider>
       <NavigationContainer ref={navigationRef} theme={colorScheme === 'dark' ? BlueDarkTheme : BlueDefaultTheme}>
         <SafeAreaProvider>
-          <BlueStorageProvider>
+          <StorageProvider>
             <SettingsProvider>
               <MasterView />
             </SettingsProvider>
-          </BlueStorageProvider>
+          </StorageProvider>
         </SafeAreaProvider>
       </NavigationContainer>
     </LargeScreenProvider>

BlueComponents.js

@@ -1,8 +1,6 @@
 /* eslint react/prop-types: "off", react-native/no-inline-styles: "off" */
-import AsyncStorage from '@react-native-async-storage/async-storage';
 import Clipboard from '@react-native-clipboard/clipboard';
-import PropTypes from 'prop-types';
-import React, { Component, forwardRef } from 'react';
+import React, { forwardRef } from 'react';
 import {
   ActivityIndicator,
   Dimensions,
@@ -16,11 +14,10 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import { Icon, Text } from 'react-native-elements';
+import { Icon, Text } from '@rneui/themed';
 
-import { BlueCurrentTheme, useTheme } from './components/themes';
-import loc, { formatStringAddTwoWhiteSpaces } from './loc';
-import NetworkTransactionFees, { NetworkTransactionFee, NetworkTransactionFeeType } from './models/networkTransactionFees';
+import { useTheme } from './components/themes';
+import loc from './loc';
 
 const { height, width } = Dimensions.get('window');
 const aspectRatio = height / width;
@@ -203,165 +200,6 @@ export const BlueLoading = props => {
   );
 };
 
-export class BlueReplaceFeeSuggestions extends Component {
-  static propTypes = {
-    onFeeSelected: PropTypes.func.isRequired,
-    transactionMinimum: PropTypes.number.isRequired,
-  };
-
-  static defaultProps = {
-    transactionMinimum: 1,
-  };
-
-  state = {
-    customFeeValue: '1',
-  };
-
-  async componentDidMount() {
-    try {
-      const cachedNetworkTransactionFees = JSON.parse(await AsyncStorage.getItem(NetworkTransactionFee.StorageKey));
-
-      if (cachedNetworkTransactionFees && 'fastestFee' in cachedNetworkTransactionFees) {
-        this.setState({ networkFees: cachedNetworkTransactionFees }, () => this.onFeeSelected(NetworkTransactionFeeType.FAST));
-      }
-    } catch (_) {}
-    const networkFees = await NetworkTransactionFees.recommendedFees();
-    this.setState({ networkFees }, () => this.onFeeSelected(NetworkTransactionFeeType.FAST));
-  }
-
-  onFeeSelected = selectedFeeType => {
-    if (selectedFeeType !== NetworkTransactionFeeType.CUSTOM) {
-      Keyboard.dismiss();
-    }
-    if (selectedFeeType === NetworkTransactionFeeType.FAST) {
-      this.props.onFeeSelected(this.state.networkFees.fastestFee);
-      this.setState({ selectedFeeType }, () => this.props.onFeeSelected(this.state.networkFees.fastestFee));
-    } else if (selectedFeeType === NetworkTransactionFeeType.MEDIUM) {
-      this.setState({ selectedFeeType }, () => this.props.onFeeSelected(this.state.networkFees.mediumFee));
-    } else if (selectedFeeType === NetworkTransactionFeeType.SLOW) {
-      this.setState({ selectedFeeType }, () => this.props.onFeeSelected(this.state.networkFees.slowFee));
-    } else if (selectedFeeType === NetworkTransactionFeeType.CUSTOM) {
-      this.props.onFeeSelected(Number(this.state.customFeeValue));
-    }
-  };
-
-  onCustomFeeTextChange = customFee => {
-    const customFeeValue = customFee.replace(/[^0-9]/g, '');
-    this.setState({ customFeeValue, selectedFeeType: NetworkTransactionFeeType.CUSTOM }, () => {
-      this.onFeeSelected(NetworkTransactionFeeType.CUSTOM);
-    });
-  };
-
-  render() {
-    const { networkFees, selectedFeeType } = this.state;
-
-    return (
-      <View>
-        {networkFees &&
-          [
-            {
-              label: loc.send.fee_fast,
-              time: loc.send.fee_10m,
-              type: NetworkTransactionFeeType.FAST,
-              rate: networkFees.fastestFee,
-              active: selectedFeeType === NetworkTransactionFeeType.FAST,
-            },
-            {
-              label: formatStringAddTwoWhiteSpaces(loc.send.fee_medium),
-              time: loc.send.fee_3h,
-              type: NetworkTransactionFeeType.MEDIUM,
-              rate: networkFees.mediumFee,
-              active: selectedFeeType === NetworkTransactionFeeType.MEDIUM,
-            },
-            {
-              label: loc.send.fee_slow,
-              time: loc.send.fee_1d,
-              type: NetworkTransactionFeeType.SLOW,
-              rate: networkFees.slowFee,
-              active: selectedFeeType === NetworkTransactionFeeType.SLOW,
-            },
-          ].map(({ label, type, time, rate, active }, index) => (
-            <TouchableOpacity
-              accessibilityRole="button"
-              key={label}
-              onPress={() => this.onFeeSelected(type)}
-              style={[
-                { paddingHorizontal: 16, paddingVertical: 8, marginBottom: 10 },
-                active && { borderRadius: 8, backgroundColor: BlueCurrentTheme.colors.incomingBackgroundColor },
-              ]}
-            >
-              <View style={{ justifyContent: 'space-between', flexDirection: 'row', alignItems: 'center' }}>
-                <Text style={{ fontSize: 22, color: BlueCurrentTheme.colors.successColor, fontWeight: '600' }}>{label}</Text>
-                <View
-                  style={{
-                    backgroundColor: BlueCurrentTheme.colors.successColor,
-                    borderRadius: 5,
-                    paddingHorizontal: 6,
-                    paddingVertical: 3,
-                  }}
-                >
-                  <Text style={{ color: BlueCurrentTheme.colors.background }}>~{time}</Text>
-                </View>
-              </View>
-              <View style={{ justifyContent: 'flex-end', flexDirection: 'row', alignItems: 'center' }}>
-                <Text style={{ color: BlueCurrentTheme.colors.successColor }}>{rate} gro/byte</Text>
-              </View>
-            </TouchableOpacity>
-          ))}
-        <TouchableOpacity
-          accessibilityRole="button"
-          onPress={() => this.customTextInput.focus()}
-          style={[
-            { paddingHorizontal: 16, paddingVertical: 8, marginBottom: 10 },
-            selectedFeeType === NetworkTransactionFeeType.CUSTOM && {
-              borderRadius: 8,
-              backgroundColor: BlueCurrentTheme.colors.incomingBackgroundColor,
-            },
-          ]}
-        >
-          <View style={{ justifyContent: 'space-between', flexDirection: 'row', alignItems: 'center' }}>
-            <Text style={{ fontSize: 22, color: BlueCurrentTheme.colors.successColor, fontWeight: '600' }}>
-              {formatStringAddTwoWhiteSpaces(loc.send.fee_custom)}
-            </Text>
-          </View>
-          <View style={{ justifyContent: 'space-between', flexDirection: 'row', alignItems: 'center', marginTop: 5 }}>
-            <TextInput
-              onChangeText={this.onCustomFeeTextChange}
-              keyboardType="numeric"
-              value={this.state.customFeeValue}
-              ref={ref => (this.customTextInput = ref)}
-              maxLength={9}
-              style={{
-                backgroundColor: BlueCurrentTheme.colors.inputBackgroundColor,
-                borderBottomColor: BlueCurrentTheme.colors.formBorder,
-                borderBottomWidth: 0.5,
-                borderColor: BlueCurrentTheme.colors.formBorder,
-                borderRadius: 4,
-                borderWidth: 1.0,
-                color: '#81868e',
-                flex: 1,
-                marginRight: 10,
-                minHeight: 33,
-                paddingRight: 5,
-                paddingLeft: 5,
-              }}
-              onFocus={() => this.onCustomFeeTextChange(this.state.customFeeValue)}
-              defaultValue={this.props.transactionMinimum}
-              placeholder={loc.send.fee_satvbyte}
-              placeholderTextColor="#81868e"
-              inputAccessoryViewID={BlueDismissKeyboardInputAccessory.InputAccessoryViewID}
-            />
-            <Text style={{ color: BlueCurrentTheme.colors.successColor }}>gro/byte</Text>
-          </View>
-        </TouchableOpacity>
-        <BlueText style={{ color: BlueCurrentTheme.colors.alternativeTextColor }}>
-          {loc.formatString(loc.send.fee_replace_minvb, { min: this.props.transactionMinimum })}
-        </BlueText>
-      </View>
-    );
-  }
-}
-
 export function BlueBigCheckmark({ style = {} }) {
   const defaultStyles = {
     backgroundColor: '#006593',

MasterView.tsx

@@ -1,9 +1,8 @@
 import 'react-native-gesture-handler'; // should be on top
 
 import React, { lazy, Suspense } from 'react';
-
-import { useStorage } from './blue_modules/storage-context';
 import MainRoot from './navigation';
+import { useStorage } from './hooks/context/useStorage';
 const CompanionDelegates = lazy(() => import('./components/CompanionDelegates'));
 
 const MasterView = () => {

NavigationService.ts

@@ -1,4 +1,4 @@
-import { createNavigationContainerRef, NavigationAction, ParamListBase } from '@react-navigation/native';
+import { createNavigationContainerRef, NavigationAction, ParamListBase, StackActions } from '@react-navigation/native';
 
 export const navigationRef = createNavigationContainerRef<ParamListBase>();
 
@@ -18,7 +18,19 @@ export function reset() {
   if (navigationRef.isReady()) {
     navigationRef.current?.reset({
       index: 0,
-      routes: [{ name: 'UnlockWithScreenRoot' }],
+      routes: [{ name: 'UnlockWithScreen' }],
     });
   }
 }
+
+export function popToTop() {
+  if (navigationRef.isReady()) {
+    navigationRef.current?.dispatch(StackActions.popToTop());
+  }
+}
+
+export function pop() {
+  if (navigationRef.isReady()) {
+    navigationRef.current?.dispatch(StackActions.pop());
+  }
+}

android/app/build.gradle

@@ -108,6 +108,8 @@ dependencies {
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.4.0'
 }
 apply plugin: 'com.google.gms.google-services'  // Google Services plugin
 

android/app/src/debug/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning">
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

android/app/src/main/AndroidManifest.xml

@@ -19,6 +19,9 @@
     <uses-permission android:name="android.permission.ACTION_OPEN_DOCUMENT" />
     <uses-permission android:name="android.permission.ACTION_GET_CONTENT" />
     <uses-permission android:name="android.permission.ACTION_CREATE_DOCUMENT" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+
 
     <application
         android:name=".MainApplication"
@@ -58,6 +61,18 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+<receiver
+    android:name=".BitcoinPriceWidget"
+    android:exported="true"
+    android:label="Bitcoin Price Widget">
+    <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+    </intent-filter>
+    <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/bitcoin_price_widget_info" />
+</receiver>
+
 
         <service
             android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"