Skip to content

Commit e4113ac

Browse files
coreyphillipscoreyphillips
authored
Merge pull request #126 from pubky/feat/recovery-phrases
Feat/recovery phrases
2 parents 2ffb74b + 0fbced4 commit e4113ac

File tree

29 files changed

+1481
-396
lines changed

29 files changed

+1481
-396
lines changed

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ android {
8282
applicationId "to.pubky.ring"
8383
minSdkVersion rootProject.ext.minSdkVersion
8484
targetSdkVersion rootProject.ext.targetSdkVersion
85-
versionCode 6
86-
versionName "1.2"
85+
versionCode 8
86+
versionName "1.3"
8787
}
8888

8989
signingConfigs {

‎ios/Podfile.lock‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,27 @@ PODS:
12401240
- React-jsiexecutor
12411241
- React-RCTFBReactNativeSpec
12421242
- ReactCommon/turbomodule/core
1243+
- react-native-blur (4.4.1):
1244+
- DoubleConversion
1245+
- glog
1246+
- hermes-engine
1247+
- RCT-Folly (= 2024.11.18.00)
1248+
- RCTRequired
1249+
- RCTTypeSafety
1250+
- React-Core
1251+
- React-debug
1252+
- React-Fabric
1253+
- React-featureflags
1254+
- React-graphics
1255+
- React-ImageManager
1256+
- React-NativeModulesApple
1257+
- React-RCTFabric
1258+
- React-rendererdebug
1259+
- React-utils
1260+
- ReactCodegen
1261+
- ReactCommon/turbomodule/bridging
1262+
- ReactCommon/turbomodule/core
1263+
- Yoga
12431264
- react-native-document-picker (10.1.3):
12441265
- DoubleConversion
12451266
- glog
@@ -1284,7 +1305,7 @@ PODS:
12841305
- Yoga
12851306
- react-native-netinfo (11.4.1):
12861307
- React-Core
1287-
- react-native-pubky (0.10.4):
1308+
- react-native-pubky (0.10.6):
12881309
- DoubleConversion
12891310
- glog
12901311
- hermes-engine
@@ -1305,7 +1326,7 @@ PODS:
13051326
- ReactCommon/turbomodule/bridging
13061327
- ReactCommon/turbomodule/core
13071328
- Yoga
1308-
- react-native-safe-area-context (5.5.0):
1329+
- react-native-safe-area-context (5.5.2):
13091330
- DoubleConversion
13101331
- glog
13111332
- hermes-engine
@@ -1318,8 +1339,8 @@ PODS:
13181339
- React-featureflags
13191340
- React-graphics
13201341
- React-ImageManager
1321-
- react-native-safe-area-context/common (= 5.5.0)
1322-
- react-native-safe-area-context/fabric (= 5.5.0)
1342+
- react-native-safe-area-context/common (= 5.5.2)
1343+
- react-native-safe-area-context/fabric (= 5.5.2)
13231344
- React-NativeModulesApple
13241345
- React-RCTFabric
13251346
- React-rendererdebug
@@ -1328,7 +1349,7 @@ PODS:
13281349
- ReactCommon/turbomodule/bridging
13291350
- ReactCommon/turbomodule/core
13301351
- Yoga
1331-
- react-native-safe-area-context/common (5.5.0):
1352+
- react-native-safe-area-context/common (5.5.2):
13321353
- DoubleConversion
13331354
- glog
13341355
- hermes-engine
@@ -1349,7 +1370,7 @@ PODS:
13491370
- ReactCommon/turbomodule/bridging
13501371
- ReactCommon/turbomodule/core
13511372
- Yoga
1352-
- react-native-safe-area-context/fabric (5.5.0):
1373+
- react-native-safe-area-context/fabric (5.5.2):
13531374
- DoubleConversion
13541375
- glog
13551376
- hermes-engine
@@ -1786,7 +1807,7 @@ PODS:
17861807
- ReactCommon/turbomodule/bridging
17871808
- ReactCommon/turbomodule/core
17881809
- Yoga
1789-
- RNGestureHandler (2.26.0):
1810+
- RNGestureHandler (2.27.1):
17901811
- DoubleConversion
17911812
- glog
17921813
- hermes-engine
@@ -2121,6 +2142,7 @@ DEPENDENCIES:
21212142
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
21222143
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
21232144
- React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
2145+
- "react-native-blur (from `../node_modules/@react-native-community/blur`)"
21242146
- "react-native-document-picker (from `../node_modules/@react-native-documents/picker`)"
21252147
- react-native-mmkv (from `../node_modules/react-native-mmkv`)
21262148
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -2251,6 +2273,8 @@ EXTERNAL SOURCES:
22512273
:path: "../node_modules/react-native/ReactCommon"
22522274
React-microtasksnativemodule:
22532275
:path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
2276+
react-native-blur:
2277+
:path: "../node_modules/@react-native-community/blur"
22542278
react-native-document-picker:
22552279
:path: "../node_modules/@react-native-documents/picker"
22562280
react-native-mmkv:
@@ -2385,11 +2409,12 @@ SPEC CHECKSUMS:
23852409
React-logger: 304814ae37503c8eb54359851cc55bd4f936b39c
23862410
React-Mapbuffer: b588d1ca18d2ce626f868f04ab12d8b1f004f12c
23872411
React-microtasksnativemodule: 11831d070aa47755bb5739069eb04ec621fec548
2412+
react-native-blur: b37343d4df1af48a17444156b674b26d5aec2425
23882413
react-native-document-picker: ead1d62b121e66ab5edbf6fcfdbfb58e81662b55
23892414
react-native-mmkv: a578df102150a1742d11e741b581bc63edef9771
23902415
react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac
2391-
react-native-pubky: 7ed7c2b66335489b757d57ac807a06b2bb10c003
2392-
react-native-safe-area-context: 2b8212f37e4186b9b7f9c25122477a229f42b032
2416+
react-native-pubky: 18f80c1f462076438efb7b4f3775303001a93966
2417+
react-native-safe-area-context: 63e27bb3aeb2c0ef652f8913d731573932080ff9
23932418
react-native-skia: 699af6a76ab9d85c8a5ffb93944ff8aca4628e2f
23942419
React-NativeModulesApple: 79a4404ac301b40bec3b367879c5e9a9ce81683c
23952420
React-perflogger: 0ea25c109dba33d47dec36b2634bf7ea67c1a555
@@ -2424,7 +2449,7 @@ SPEC CHECKSUMS:
24242449
RNCAsyncStorage: efa02b644121f4e1f7f33e712f4f82c30aa4ff4a
24252450
RNCClipboard: 41b301766fd5ec1d91b4cd7130607a2e99518bb2
24262451
RNFlashList: 31c774f49d75ecc2309bdfc19008fc3bed5111a7
2427-
RNGestureHandler: 5fca159e221d84c26a24d249ef5552c0393776e2
2452+
RNGestureHandler: 968f5e8c975d81bbe98233677444894b1e8bb2fa
24282453
RNKeychain: 8854726dc7c45dbcc0db9a0444ae58a8b7b07266
24292454
RNPermissions: 8e00aa666b05a79f1aa5940849e2c059b0f0d921
24302455
RNReanimated: c021f620a8a8494147399ed4e02fdc09fb60ac35

‎ios/pubkyring.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,14 @@
235235
inputFileListPaths = (
236236
"${PODS_ROOT}/Target Support Files/Pods-pubkyring/Pods-pubkyring-resources-${CONFIGURATION}-input-files.xcfilelist",
237237
);
238+
inputPaths = (
239+
);
238240
name = "[CP] Copy Pods Resources";
239241
outputFileListPaths = (
240242
"${PODS_ROOT}/Target Support Files/Pods-pubkyring/Pods-pubkyring-resources-${CONFIGURATION}-output-files.xcfilelist",
241243
);
244+
outputPaths = (
245+
);
242246
runOnlyForDeploymentPostprocessing = 0;
243247
shellPath = /bin/sh;
244248
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-pubkyring/Pods-pubkyring-resources.sh\"\n";
@@ -252,10 +256,14 @@
252256
inputFileListPaths = (
253257
"${PODS_ROOT}/Target Support Files/Pods-pubkyring/Pods-pubkyring-frameworks-${CONFIGURATION}-input-files.xcfilelist",
254258
);
259+
inputPaths = (
260+
);
255261
name = "[CP] Embed Pods Frameworks";
256262
outputFileListPaths = (
257263
"${PODS_ROOT}/Target Support Files/Pods-pubkyring/Pods-pubkyring-frameworks-${CONFIGURATION}-output-files.xcfilelist",
258264
);
265+
outputPaths = (
266+
);
259267
runOnlyForDeploymentPostprocessing = 0;
260268
shellPath = /bin/sh;
261269
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-pubkyring/Pods-pubkyring-frameworks.sh\"\n";
@@ -281,7 +289,7 @@
281289
buildSettings = {
282290
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
283291
CLANG_ENABLE_MODULES = YES;
284-
CURRENT_PROJECT_VERSION = 1;
292+
CURRENT_PROJECT_VERSION = 2;
285293
DEVELOPMENT_TEAM = KYH47R284B;
286294
ENABLE_BITCODE = NO;
287295
INFOPLIST_FILE = pubkyring/Info.plist;
@@ -292,7 +300,7 @@
292300
"$(inherited)",
293301
"@executable_path/Frameworks",
294302
);
295-
MARKETING_VERSION = 0.3;
303+
MARKETING_VERSION = 0.4;
296304
OTHER_LDFLAGS = (
297305
"$(inherited)",
298306
"-ObjC",
@@ -312,7 +320,7 @@
312320
buildSettings = {
313321
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
314322
CLANG_ENABLE_MODULES = YES;
315-
CURRENT_PROJECT_VERSION = 1;
323+
CURRENT_PROJECT_VERSION = 2;
316324
DEVELOPMENT_TEAM = KYH47R284B;
317325
INFOPLIST_FILE = pubkyring/Info.plist;
318326
INFOPLIST_KEY_CFBundleDisplayName = "Pubky Ring";
@@ -322,7 +330,7 @@
322330
"$(inherited)",
323331
"@executable_path/Frameworks",
324332
);
325-
MARKETING_VERSION = 0.3;
333+
MARKETING_VERSION = 0.4;
326334
OTHER_LDFLAGS = (
327335
"$(inherited)",
328336
"-ObjC",
@@ -405,10 +413,7 @@
405413
"-DFOLLY_CFG_NO_COROUTINES=1",
406414
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
407415
);
408-
OTHER_LDFLAGS = (
409-
"$(inherited)",
410-
" ",
411-
);
416+
OTHER_LDFLAGS = "$(inherited) ";
412417
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
413418
SDKROOT = iphoneos;
414419
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -477,10 +482,7 @@
477482
"-DFOLLY_CFG_NO_COROUTINES=1",
478483
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
479484
);
480-
OTHER_LDFLAGS = (
481-
"$(inherited)",
482-
" ",
483-
);
485+
OTHER_LDFLAGS = "$(inherited) ";
484486
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
485487
SDKROOT = iphoneos;
486488
USE_HERMES = true;

‎ios/pubkyring.xcodeproj/xcshareddata/xcschemes/pubkyring.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pubkyring",
3-
"version": "0.0.17-1",
4-
"private": true,
3+
"version": "0.0.18",
4+
"private": false,
55
"scripts": {
66
"android": "react-native run-android",
77
"ios": "react-native run-ios",
@@ -13,15 +13,17 @@
1313
"@dr.pogodin/react-native-fs": "2.34.0",
1414
"@react-native-async-storage/async-storage": "2.2.0",
1515
"@react-native-clipboard/clipboard": "^1.16.2",
16+
"@react-native-community/blur": "^4.4.1",
1617
"@react-native-community/netinfo": "^11.4.1",
1718
"@react-native-documents/picker": "10.1.3",
1819
"@react-navigation/native": "7.1.14",
1920
"@react-navigation/native-stack": "7.3.21",
2021
"@reduxjs/toolkit": "2.8.2",
2122
"@shopify/flash-list": "1.8.2",
2223
"@shopify/react-native-skia": "2.0.0-next.3",
23-
"@synonymdev/react-native-pubky": "0.10.4",
24+
"@synonymdev/react-native-pubky": "0.10.6",
2425
"@synonymdev/result": "^0.0.2",
26+
"bip39": "^3.1.0",
2527
"buffer": "^6.0.3",
2628
"jdenticon": "^3.3.0",
2729
"lucide-react-native": "^0.483.0",

0 commit comments

Comments
 (0)