Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gruve-p committed Dec 26, 2023
2 parents 6788ac2 + 9cdc4db commit 6501b7f
Show file tree
Hide file tree
Showing 20 changed files with 95 additions and 66 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build-release-testflight-ipa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ jobs:
- name: Install Fastlane 2.217.0
run: gem install fastlane -v 2.217.0

- name: Install CocoaPods
run: sudo gem install cocoapods
- name: Install CocoaPods Dependencies
run: bundle install
working-directory: ./ios

- name: Clear Derived Data
run: bundle exec fastlane ios clear_derived_data_lane
Expand Down
16 changes: 12 additions & 4 deletions UnlockWith.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,23 @@ import { StackActions, useNavigation, useRoute } from '@react-navigation/native'
import { BlueStorageContext } from './blue_modules/storage-context';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
import { isHandset } from './blue_modules/environment';
const lottieJson = require('./img/bluewalletsplash.json');

const styles = StyleSheet.create({
root: {
flex: 1,
},
container: {
flex: 1,
justifyContent: 'space-between',
justifyContent: 'center',
alignItems: 'center',
},
biometric: {
flex: 1,
justifyContent: 'flex-end',
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
alignItems: 'center',
marginBottom: 58,
},
biometricRow: {
Expand All @@ -31,6 +35,10 @@ const styles = StyleSheet.create({
width: 64,
height: 64,
},
lottie: {
width: lottieJson.w,
height: lottieJson.h,
},
});

const UnlockWith = () => {
Expand Down Expand Up @@ -130,7 +138,7 @@ const UnlockWith = () => {
return (
<SafeAreaView style={styles.root}>
<View style={styles.container}>
<LottieView source={require('./img/bluewalletsplash.json')} autoPlay loop={false} onAnimationFinish={onAnimationFinish} />
<LottieView source={lottieJson} autoPlay loop={false} onAnimationFinish={onAnimationFinish} style={styles.lottie} />
<View style={styles.biometric}>{animationDidFinish && <View style={styles.biometricRow}>{renderUnlockOptions()}</View>}</View>
</View>
</SafeAreaView>
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "6.4.13"
versionName "6.4.14"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
Expand Down
1 change: 1 addition & 0 deletions blue_modules/BlueElectrum.js
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,7 @@ module.exports.multiGetHistoryByAddress = async function (addresses, batchsize)
};

module.exports.multiGetTransactionByTxid = async function (txids, batchsize, verbose = true) {
txids = txids.filter(txid => !!txid); // failsafe: removing 'undefined' or other falsy stuff from txids array
batchsize = batchsize || 45;
// this value is fine-tuned so althrough wallets in test suite will occasionally
// throw 'response too large (over 1,000,000 bytes', test suite will pass
Expand Down
2 changes: 1 addition & 1 deletion class/synced-async-storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default class SyncedAsyncStorage {
console.log('saved, seq num:', text);
resolve(text);
})
.catch(reason => reject(reason));
.catch((reason: Error) => reject(reason));
});
}

Expand Down
3 changes: 2 additions & 1 deletion class/wallets/abstract-hd-electrum-wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ export class AbstractHDElectrumWallet extends AbstractHDWallet {
const vinTxids = [];
for (const txdata of Object.values(txdatas)) {
for (const vin of txdata.vin) {
vinTxids.push(vin.txid);
vin.txid && vinTxids.push(vin.txid);
// ^^^^ not all inputs have txid, some of them are Coinbase (newly-created coins)
}
}
const vintxdatas = await BlueElectrum.multiGetTransactionByTxid(vinTxids);
Expand Down
3 changes: 2 additions & 1 deletion class/wallets/legacy-wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ export class LegacyWallet extends AbstractWallet {
const vinTxids = [];
for (const txdata of transactions) {
for (const vin of txdata.vin) {
vinTxids.push(vin.txid);
vin.txid && vinTxids.push(vin.txid);
// ^^^^ not all inputs have txid, some of them are Coinbase (newly-created coins)
}
}
const vintxdatas = await BlueElectrum.multiGetTransactionByTxid(vinTxids);
Expand Down
2 changes: 1 addition & 1 deletion components/QRCodeComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const QRCodeComponent: React.FC<QRCodeComponentProps> = ({
const shareImageBase64 = {
url: `data:image/png;base64,${data}`,
};
Share.open(shareImageBase64).catch((error: any) => console.log(error));
Share.open(shareImageBase64).catch((error: Error) => console.log(error));
});
};

Expand Down
2 changes: 1 addition & 1 deletion components/TransactionsNavigationHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const TransactionsNavigationHeader: React.FC<TransactionsNavigationHeaderProps>
wallet
.allowOnchainAddress()
.then((value: boolean) => setAllowOnchainAddress(value))
.catch((e: any) => {
.catch((e: Error) => {
console.log('This Lndhub wallet does not have an onchain address API.');
setAllowOnchainAddress(false);
});
Expand Down
2 changes: 1 addition & 1 deletion hooks/useAsyncPromise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function useAsyncPromise<T>(promiseFn: () => Promise<T>) {
setLoading(false);
}
})
.catch(err => {
.catch((err: Error) => {
if (isMounted) {
setError(err);
setLoading(false);
Expand Down
44 changes: 22 additions & 22 deletions ios/BlueWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = CMG3V3T59A;
ENABLE_BITCODE = NO;
Expand All @@ -1293,7 +1293,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1325,7 +1325,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = CMG3V3T59A;
ENABLE_BITCODE = NO;
Expand All @@ -1343,7 +1343,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1377,7 +1377,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1389,7 +1389,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
Expand Down Expand Up @@ -1418,7 +1418,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1430,7 +1430,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.Stickers;
Expand Down Expand Up @@ -1459,7 +1459,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1476,7 +1476,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
Expand Down Expand Up @@ -1511,7 +1511,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1528,7 +1528,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.MarketWidget;
Expand Down Expand Up @@ -1682,7 +1682,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1698,7 +1698,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
Expand Down Expand Up @@ -1731,7 +1731,7 @@
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1747,7 +1747,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.watch.extension;
Expand Down Expand Up @@ -1779,7 +1779,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1791,7 +1791,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
Expand Down Expand Up @@ -1826,7 +1826,7 @@
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = CMG3V3T59A;
Expand All @@ -1838,7 +1838,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 6.4.13;
MARKETING_VERSION = 6.4.14;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.watch;
Expand Down Expand Up @@ -1868,7 +1868,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
Expand Down Expand Up @@ -1918,7 +1918,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1703112604;
CURRENT_PROJECT_VERSION = 1703112605;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
Expand Down
Loading

0 comments on commit 6501b7f

Please sign in to comment.