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
GLaDOS
caefb28476
Merge pull request #2266 from BlueWallet/Modal-on-multisig-seed-#2176-
...
FIX: Modal on multisig seed #2176
2020-12-12 02:31:36 +00: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
18ada36692
Merge branch 'master' into rndeviceinfo
2020-12-11 19:29:45 -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
GLaDOS
d0f0808ebf
Merge pull request #2321 from BlueWallet/imagepicker
...
OPS: Use new Image Picker
2020-12-11 23:22:10 +00: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
MC Saeid
d4a56b95c6
REF: Update en.json (Final)
2020-12-12 01:09:04 +03:30
marcosrdz
9c12d3e84d
OPS: RNDevice Info Update
2020-12-11 16:30:48 -05: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
Overtorment
b3cade5923
Update abstract-wallet.js
2020-12-11 21:11:38 +00:00
marcosrdz
025c46c308
FIX: Use CC JSON label for wallet name
2020-12-11 21:11:38 +00:00
marcosrdz
62561c3984
ADD: biometrics verification on coordination edit and loading indicators
2020-12-11 20:33:57 +00:00
Overtorment
be0c44669c
FIX: some cases of lnurl-withdraw
2020-12-11 20:27:59 +00:00
marcosrdz
3e3b5fc5da
ADD: Linear gradient props
2020-12-11 20:13:36 +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
GLaDOS
0481a476b6
Merge pull request #2325 from BlueWallet/hodlhodlwebviewhooks
...
REF: HodlHodlWebView Hooks
2020-12-11 11:26:13 +00:00
GLaDOS
47164a0244
Merge pull request #2326 from BlueWallet/compfunc
...
REF: Some class components to functional
2020-12-11 11:04:44 +00:00
marcosrdz
9f4f14d57a
REF: Some class components to functional
2020-12-10 23:17:55 -05:00
marcosrdz
47a5452ee0
REF: HodlHodlWebView Hooks
2020-12-10 23:09:54 -05:00
marcosrdz
a92ed3ef54
Update scanLndInvoice.js
2020-12-10 22:56:01 -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
85fa3122cf
Update build.gradle
2020-12-10 18:15:09 -05:00
marcosrdz
33be2cb22e
Merge branch 'master' into imagepicker
2020-12-10 16:02:46 -05:00
MC Saeid
69cf650f75
REF: Updating en.json
...
Since there were multiple merges, many of the changes were undone, including punctuation marks, capitalization, etc. But this is everything—nearly perfect.
2020-12-10 22:49:27 +03:30
GLaDOS
7619b1f53e
Merge pull request #2318 from BlueWallet/mcsaeid-patch-5
...
Mcsaeid patch 5
2020-12-10 18:22:17 +00:00
GLaDOS
44f245510d
Merge pull request #2320 from BlueWallet/translations_loc-en-json--master_fa_IR
...
Translate '/loc/en.json' in 'fa_IR'
2020-12-10 18:22:12 +00:00
marcosrdz
35dc6849ef
OPS: Fix test
2020-12-10 12:57:05 -05:00
marcosrdz
5b30f2f3ea
OPS: Use new Image Picker
2020-12-10 12:40:14 -05:00
transifex-integration[bot]
0698420f50
Translate /loc/en.json in fa_IR
...
review completed for the source file '/loc/en.json'
on the 'fa_IR' language.
2020-12-10 17:25:57 +00:00
Overtorment
ec515df7b1
TST: fix e2e
2020-12-10 16:44:14 +00:00