Merge remote-tracking branch 'upstream/master'

Groestlcoin · Apr 29, 2024 · a61ec0e · a61ec0e
2 parents bf12ebf + 1a2be15
commit a61ec0e
Show file tree

Hide file tree

Showing 51 changed files with 1,006 additions and 412 deletions.
diff --git a/BlueComponents.js b/BlueComponents.js
@@ -441,41 +441,4 @@ export function BlueBigCheckmark({ style = {} }) {
       <Icon name="check" size={50} type="font-awesome" color="#0f5cc0" />
     </View>
   );
-}
-
-const tabsStyles = StyleSheet.create({
-  root: {
-    flexDirection: 'row',
-    height: 50,
-    borderColor: '#e3e3e3',
-    borderBottomWidth: 1,
-  },
-  tabRoot: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    borderColor: 'white',
-    borderBottomWidth: 2,
-  },
-});
-
-export const BlueTabs = ({ active, onSwitch, tabs }) => (
-  <View style={[tabsStyles.root, isIpad && { marginBottom: 30 }]}>
-    {tabs.map((Tab, i) => (
-      <TouchableOpacity
-        key={i}
-        accessibilityRole="button"
-        onPress={() => onSwitch(i)}
-        style={[
-          tabsStyles.tabRoot,
-          active === i && {
-            borderColor: BlueCurrentTheme.colors.buttonAlternativeTextColor,
-            borderBottomWidth: 2,
-          },
-        ]}
-      >
-        <Tab active={active === i} />
-      </TouchableOpacity>
-    ))}
-  </View>
-);
+}
diff --git a/Navigation.tsx b/Navigation.tsx
@@ -20,7 +20,7 @@ import NotificationSettings from './screen/settings/notificationSettings';
 import ReleaseNotes from './screen/settings/releasenotes';
 import Tools from './screen/settings/tools';
 
-import AddWallet from './screen/wallets/add';
+import AddWallet from './screen/wallets/Add';
 import WalletsAddMultisig from './screen/wallets/addMultisig';
 import WalletsAddMultisigHelp, { WalletAddMultisigHelpNavigationOptions } from './screen/wallets/addMultisigHelp';
 import WalletsAddMultisigStep2 from './screen/wallets/addMultisigStep2';
@@ -49,7 +49,7 @@ import CPFP from './screen/transactions/CPFP';
 import RBFBumpFee from './screen/transactions/RBFBumpFee';
 import RBFCancel from './screen/transactions/RBFCancel';
 import TransactionDetails from './screen/transactions/details';
-import TransactionStatus from './screen/transactions/transactionStatus';
+import TransactionStatus from './screen/transactions/TransactionStatus';
 
 import AztecoRedeem from './screen/receive/aztecoRedeem';
 import ReceiveDetails from './screen/receive/details';
@@ -107,7 +107,21 @@ const WalletsRoot = () => {
       <WalletsStack.Screen name="WalletDetails" component={WalletDetails} options={WalletDetails.navigationOptions(theme)} />
       <WalletsStack.Screen name="LdkViewLogs" component={LdkViewLogs} options={LdkViewLogs.navigationOptions(theme)} />
       <WalletsStack.Screen name="TransactionDetails" component={TransactionDetails} options={TransactionDetails.navigationOptions(theme)} />
-      <WalletsStack.Screen name="TransactionStatus" component={TransactionStatus} options={TransactionStatus.navigationOptions(theme)} />
+      <WalletsStack.Screen
+        name="TransactionStatus"
+        component={TransactionStatus}
+        initialParams={{
+          hash: undefined,
+          walletID: undefined,
+        }}
+        options={navigationStyle({
+          title: '',
+          statusBarStyle: 'auto',
+          headerStyle: {
+            backgroundColor: theme.colors.customHeader,
+          },
+        })(theme)}
+      />
       <WalletsStack.Screen name="CPFP" component={CPFP} options={CPFP.navigationOptions(theme)} />
       <WalletsStack.Screen name="RBFBumpFee" component={RBFBumpFee} options={RBFBumpFee.navigationOptions(theme)} />
       <WalletsStack.Screen name="RBFCancel" component={RBFCancel} options={RBFCancel.navigationOptions(theme)} />

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -79,7 +79,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "6.6.3"
+        versionName "6.6.4"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
-        kotlin_version = '1.9.22'
+        kotlin_version = '1.9.23'
         kotlinVersion = '1.9.20'
     }
     repositories {

diff --git a/blue_modules/currency.ts b/blue_modules/currency.ts
@@ -9,7 +9,7 @@ const PREFERRED_CURRENCY_STORAGE_KEY = 'preferredCurrency';
 const PREFERRED_CURRENCY_LOCALE_STORAGE_KEY = 'preferredCurrencyLocale';
 const EXCHANGE_RATES_STORAGE_KEY = 'exchangeRates';
 const LAST_UPDATED = 'LAST_UPDATED';
-const GROUP_IO_BLUEWALLET = 'group.org.groestlcoin.bluewallet123';
+export const GROUP_IO_BLUEWALLET = 'group.org.groestlcoin.bluewallet123';
 const BTC_PREFIX = 'GRS_';
 
 export interface CurrencyRate {
@@ -113,6 +113,11 @@ async function isRateOutdated(): Promise<boolean> {
   }
 }
 
+async function restoreSavedPreferredFiatCurrencyAndExchangeFromStorage(): Promise<void> {
+  await _restoreSavedExchangeRatesFromStorage();
+  await _restoreSavedPreferredFiatCurrencyFromStorage();
+}
+
 async function initCurrencyDaemon(clearLastUpdatedTime: boolean = false): Promise<void> {
   await _restoreSavedExchangeRatesFromStorage();
   await _restoreSavedPreferredFiatCurrencyFromStorage();
@@ -235,4 +240,5 @@ export {
   LAST_UPDATED,
   mostRecentFetchedRate,
   isRateOutdated,
+  restoreSavedPreferredFiatCurrencyAndExchangeFromStorage,
 };
diff --git a/blue_modules/fs.ts b/blue_modules/fs.ts
@@ -1,15 +1,14 @@
 import { Alert, Linking, PermissionsAndroid, Platform } from 'react-native';
 import RNFS from 'react-native-fs';
 import Share from 'react-native-share';
+import LocalQRCode from '@remobile/react-native-qrcode-local-image';
 import loc from '../loc';
 import DocumentPicker from 'react-native-document-picker';
 import { launchImageLibrary } from 'react-native-image-picker';
 import { isDesktop } from './environment';
 import presentAlert from '../components/Alert';
 import { readFile } from './react-native-bw-file-access';
 
-const LocalQRCode = require('@remobile/react-native-qrcode-local-image');
-
 const _shareOpen = async (filePath: string, showShareDialog: boolean = false) => {
   return await Share.open({
     url: 'file://' + filePath,

diff --git a/blue_modules/storage-context.tsx b/blue_modules/storage-context.tsx
@@ -185,7 +185,10 @@ export const BlueStorageProvider = ({ children }: { children: React.ReactNode })
     addWallet(w);
     await saveToDisk();
     A(A.ENUM.CREATED_WALLET);
-    presentAlert({ message: w.type === WatchOnlyWallet.type ? loc.wallets.import_success_watchonly : loc.wallets.import_success });
+    presentAlert({
+      hapticFeedback: HapticFeedbackTypes.ImpactHeavy,
+      message: w.type === WatchOnlyWallet.type ? loc.wallets.import_success_watchonly : loc.wallets.import_success,
+    });
     // @ts-ignore need to type notifications first
     // Notifications.majorTomToGroundControl(w.getAllExternalAddresses(), [], []);
     // start balance fetching at the background