776 Commits

Author	SHA1	Message	Date
marcosrdz	c44a1706a0	Merge branch 'master' into opspack	2020-12-17 19:46:48 -05:00
marcosrdz	04c27ec84c	FIX: backup screen would flash during loading on dark mode	2020-12-17 11:54:27 +00:00
marcosrdz	e613e4c552	FIX: Disable handoff for Multisig	2020-12-16 17:22:31 -05:00
marcosrdz	36da04566c	Merge branch 'master' into opspack	2020-12-16 13:47:14 -05:00
marcosrdz	c83d1777ed	REF: Use fs.showActionSheet if Desktop	2020-12-16 16:28:59 +00:00
marcosrdz	92ab26a04c	REF: Use fs module for screens that show action sheet	2020-12-16 16:28:59 +00:00
Overtorment	85022029e3	FIX: contradiction in Vaul introduction text (closes #2327)	2020-12-16 14:30:57 +00:00
marcosrdz	5527d62b40	OPS: Update packages	2020-12-15 22:15:57 -05:00
ncoelho	d7c3005bce	Merge branch 'master' of https://github.com/BlueWallet/BlueWallet into add-multisig	2020-12-13 21:09:16 +01:00
GLaDOS	7afdd3394f	Merge pull request #2308 from BlueWallet/msmac ... FIX: Was unable to import key on macOS	2020-12-13 10:07:35 +00:00
GLaDOS	6d87fc8e5f	Merge pull request #2334 from BlueWallet/keysedit ... REF: Manage keys spacing	2020-12-12 18:34:09 +00:00
GLaDOS	5c958dc00b	Merge pull request #2333 from BlueWallet/editkeys ... REF: Manage Keys screen	2020-12-12 18:31:29 +00:00
marcosrdz	e6e344044c	Merge branch 'master' into msmac	2020-12-12 11:11:21 -05:00
marcosrdz	a5b1e29659	REF: ExportMultisigCoordinationSetup Stack	2020-12-12 01:42:23 -05:00
marcosrdz	a537917b0d	Merge branch 'master' into keysedit	2020-12-12 01:41:33 -05:00
marcosrdz	5b9bc82c91	Merge branch 'master' into msmac	2020-12-12 01:34:48 -05:00
marcosrdz	2e84b1813c	Merge branch 'master' into scanlndhook	2020-12-12 01:32:30 -05:00
marcosrdz	9027b56543	Merge branch 'master' into Modal-on-multisig-seed-#2176-	2020-12-11 19:48:58 -05:00
marcosrdz	9bc29aefab	Merge branch 'master' into msmac	2020-12-11 19:32:02 -05:00
marcosrdz	f91e8676ca	Update viewEditMultisigCosigners.js	2020-12-11 19:29:17 -05:00
marcosrdz	1cafdbf24c	Merge branch 'master' into editkeys	2020-12-11 19:28:55 -05:00
marcosrdz	a952c0ab11	REF: Place view cosigners seperately	2020-12-11 19:27:43 -05:00
marcosrdz	77295cbef9	Revert "REF: Manage keys spacing" ... This reverts commit 2310bd45e3.	2020-12-11 19:22:36 -05:00
marcosrdz	e85b3e44f8	Merge branch 'master' into scanlndhook	2020-12-11 19:19:51 -05:00
ncoelho	2310bd45e3	REF: Manage keys spacing	2020-12-11 23:59:53 +01:00
ncoelho	a079a11f30	REF: Manage Keys screen ... add view instead of share. Fixes the title	2020-12-11 23:20:04 +01:00
marcosrdz	9dc9372a64	OPS: Lint	2020-12-11 22:17:50 +00:00
marcosrdz	94b9446c99	Update viewEditMultisigCosigners.js	2020-12-11 16:22:20 -05:00
marcosrdz	ac862a3e9a	Update viewEditMultisigCosigners.js	2020-12-11 16:19:10 -05:00
marcosrdz	ba907b6ceb	Merge branch 'master' into scanlndhook	2020-12-11 16:18:10 -05:00
marcosrdz	2a55566fe2	Merge branch 'master' into add-multisig	2020-12-11 16:16:50 -05:00
marcosrdz	e8dca6e151	Merge branch 'master' into msmac	2020-12-11 16:16:24 -05:00
marcosrdz	e44d638b3c	Merge branch 'master' into imagepicker	2020-12-11 16:12:07 -05:00
marcosrdz	2c3c95f675	Merge branch 'master' into Modal-on-multisig-seed-#2176-	2020-12-11 16:11:38 -05:00
marcosrdz	62561c3984	ADD: biometrics verification on coordination edit and loading indicators	2020-12-11 20:33:57 +00:00
marcosrdz	63604e83dc	Update viewEditMultisigCosigners.js	2020-12-11 20:13:36 +00:00
marcosrdz	b3d480326f	ADD: Manage Keys button	2020-12-11 20:13:36 +00:00
marcosrdz	47a5452ee0	REF: HodlHodlWebView Hooks	2020-12-10 23:09:54 -05:00
marcosrdz	4a12705098	Merge branch 'master' into scanlndhook	2020-12-10 22:39:44 -05:00
marcosrdz	79d993ac6b	REF: Reuse fs	2020-12-10 22:28:54 -05:00
marcosrdz	4ad7745832	REF: Reuse showFilePickerAndReadFile	2020-12-10 22:16:59 -05:00
marcosrdz	239d9eb404	Merge branch 'master' into msmac	2020-12-10 22:08:45 -05:00
marcosrdz	8a6ba6cb02	FIX: Android crash	2020-12-10 18:26:45 -05:00
marcosrdz	5b30f2f3ea	OPS: Use new Image Picker	2020-12-10 12:40:14 -05:00
marcosrdz	fcd61c35b2	ADD: Display error if saving file fails on Android	2020-12-10 16:29:47 +00:00
marcosrdz	94206a13eb	FIX: Was unable to import key on macOS	2020-12-09 16:20:50 -05:00
marcosrdz	6228397cc9	Update addMultisigStep2.js	2020-12-09 13:12:57 -05:00
marcosrdz	93a4e1ed86	Merge branch 'master' into Modal-on-multisig-seed-#2176-	2020-12-09 13:11:10 -05:00
ncoelho	25a136c660	Remove dead code	2020-12-09 18:37:29 +01:00
marcosrdz	a3e7bee618	Merge branch 'master' into helpms	2020-12-09 10:08:13 -05:00