mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-23 15:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into actionmenu

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2021-08-24 01:03:26 -04:00
commit e0f95b50ed
5 changed files with 654 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/DynamicQRCode.js
View file

@ -170,6 +170,9 @@ const animatedQRCodeStyle = StyleSheet.create({
flex: 1,
flexDirection: 'column',
alignItems: 'center',
borderWidth: 6,
borderRadius: 8,
borderColor: '#FFFFFF',
},
qrcodeContainer: {
alignItems: 'center',

14
ios/BlueWallet.xcodeproj/project.pbxproj
View file

@ -50,7 +50,7 @@
6DD410BF266CB13D0087DE03 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4BFA254FBA0E00E9F9AA /* Models.swift */; };
6DD410C0266CB1460087DE03 /* MarketWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9946622555A660000E52E8 /* MarketWidget.swift */; };
6DF25A9F249DB97E001D06F5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6DF25A9E249DB97E001D06F5 /* LaunchScreen.storyboard */; };
6DFC807024EA0B6C007B8700 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */; };
6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* EFQRCode */; };
6DFC807224EA2FA9007B8700 /* ViewQRCodefaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFC807124EA2FA9007B8700 /* ViewQRCodefaceController.swift */; };
764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B468CC34D5B41F3950078EF /* libsqlite3.0.tbd */; };
782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B9D9B3A7B2CB4255876B67AF /* libz.tbd */; };
@ -395,7 +395,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
6DFC807024EA0B6C007B8700 /* BuildFile in Frameworks */,
6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -832,7 +832,7 @@
);
name = "BlueWalletWatch Extension";
packageProductDependencies = (
6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */,
6DFC806F24EA0B6C007B8700 /* EFQRCode */,
);
productName = "BlueWalletWatch Extension";
productReference = B40D4E3C225841ED00428FCC /* BlueWalletWatch Extension.appex */;
@ -916,7 +916,7 @@
);
mainGroup = 83CBB9F61A601CBA00E9B192;
packageReferences = (
6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */,
6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */,
);
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
@ -1941,7 +1941,7 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */ = {
6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/EFPrefix/EFQRCode.git";
requirement = {
@ -1952,9 +1952,9 @@
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */ = {
6DFC806F24EA0B6C007B8700 /* EFQRCode */ = {
isa = XCSwiftPackageProductDependency;
package = 6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */;
package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */;
productName = EFQRCode;
};
/* End XCSwiftPackageProductDependency section */

4
ios/Podfile.lock
View file

@ -428,7 +428,7 @@ PODS:
- React-RCTVibration
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.5.0):
- RNScreens (3.6.0):
- React-Core
- React-RCTImage
- RNSecureKeyStore (1.0.0):
@ -786,7 +786,7 @@ SPEC CHECKSUMS:
RNRate: e0af7e724e5fcf89578dbd22ab6395c85402ef29
RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563
RNScreens: 01ab149b5dd5c27f5ff26741b1d2bdf2cee1af35
RNScreens: eb0dfb2d6b21d2d7f980ad46b14eb306d2f1062e
RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
RNShare: 00e7409201e3cab13e0febc41fd4465a83ae8225
RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f

899
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -176,7 +176,7 @@
"react-native-rate": "1.2.6",
"react-native-reanimated": "2.2.0",
"react-native-safe-area-context": "3.3.0",
"react-native-screens": "3.5.0",
"react-native-screens": "3.6.0",
"react-native-secure-key-store": "https://github.com/BlueWallet/react-native-secure-key-store#63ab38c9d382a819844a086a69cc204c46aa93f9",
"react-native-share": "7.0.0",
"react-native-sortable-list": "https://github.com/BlueWallet/react-native-sortable-list.git#46e39a30ae0c4328e7c06c30b72b1af0b69e1aeb",
@ -187,7 +187,7 @@
"react-native-watch-connectivity": "1.0.4",
"react-native-webview": "11.13.0",
"react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#b1382bbe1ed631b50a8aa03390f64c50775bc9ff",
"react-native-windows": "0.64.14",
"react-native-windows": "0.65.0",
"react-test-render": "1.1.2",
"readable-stream": "3.6.0",
"realm": "10.6.1",