julian
|
0164679cce
|
File system path clean up
|
2022-11-12 16:07:57 -06:00 |
|
julian
|
f08a52cd07
|
remove direct dependency of unused SharedPreferences
|
2022-11-12 09:16:07 -06:00 |
|
julian
|
077ba6429b
|
Merge branch 'staging' into desktop-testing
|
2022-11-11 13:24:00 -06:00 |
|
julian
|
9b09f65f4d
|
remove flutter secure storage explicit instantiations from wow/xmr
|
2022-11-11 12:12:01 -06:00 |
|
julian
|
b6613b2fd7
|
stop logging monero sync non-error
|
2022-11-11 09:33:58 -06:00 |
|
julian
|
676b26ce37
|
stop logging annoying monero sync non error
|
2022-11-11 09:30:13 -06:00 |
|
sneurlax
|
07c99309ff
|
use native address validation
|
2022-11-10 10:21:07 -06:00 |
|
julian
|
c7a6ffd3e4
|
Merge branch 'staging' into desktop-testing
|
2022-11-09 17:58:34 -06:00 |
|
julian
|
3ee0e97628
|
DesktopSecureStore implementation using Isar as backend, renamed FlutterSecureStorageInterface
|
2022-11-09 17:55:34 -06:00 |
|
julian
|
2bdf5f152c
|
dynamic secure storage provider
|
2022-11-09 17:55:34 -06:00 |
|
sneurlax
|
bad88aeecb
|
Merge branch 'staging' into wownero/25-word
|
2022-11-09 08:33:15 -06:00 |
|
sneurlax
|
357b93d6e8
|
use wownero.getHeightByDate
and save bufferedHeight upon Monero wallet creation
|
2022-11-09 00:16:21 -06:00 |
|
sneurlax
|
d23f6f2823
|
return to use of final for bufferedCreateHeight using inline if
and use wowlet's height estimation function for 14 word seeds
|
2022-11-08 13:48:29 -06:00 |
|
sneurlax
|
48e8501e27
|
cherrypick e41f8088b0
|
2022-11-08 13:35:27 -06:00 |
|
julian
|
e41f8088b0
|
WIP: wownero 25 word seed option ui
|
2022-11-08 12:00:10 -06:00 |
|
sneurlax
|
7c3d40782c
|
add generation tests and update flutter_libmonero ref
change seedWords to SeedWordsLength to match rest of codebase
|
2022-11-08 09:55:15 -06:00 |
|
julian
|
fa0c982274
|
Return what we internally consider the "txid" for epic transactions from the epic confirmSend to be consistent with all other coins confirmSend return value. This should fix the epic notes issue.
|
2022-11-08 07:35:28 -06:00 |
|
julian
|
c962f597fd
|
added extra checks to BCH as well as test cases
|
2022-11-07 15:48:27 -06:00 |
|
sneurlax
|
b41c4c37bd
|
delineate divergence point more clearly
|
2022-11-07 14:46:48 -06:00 |
|
sneurlax
|
6e5a0bad78
|
do not use wownero-seed (wow_seed) function for height, hardcoded POC
|
2022-11-07 14:42:52 -06:00 |
|
julian
|
bb260e3a23
|
hacky fix (due to current persistence design) to get sent transactions showing up right away for electrumx coins
|
2022-11-07 10:24:37 -06:00 |
|
julian
|
786831bcef
|
alphabetically sort contacts
|
2022-11-07 10:24:37 -06:00 |
|
julian
|
e87aa64e1b
|
isFavorite bandaid fix for https://github.com/cypherstack/stack_wallet/issues/203
|
2022-11-05 09:40:28 -06:00 |
|
julian
|
7dbc9d270b
|
temp bch send fix testnet and fix tests
|
2022-11-04 18:18:39 -06:00 |
|
julian
|
74b075328f
|
temp bch send fix
|
2022-11-04 17:42:45 -06:00 |
|
julian
|
ccd94fcf86
|
bch compare address type to constant names instead of int literals
|
2022-11-04 17:42:45 -06:00 |
|
julian
|
039a9a68f6
|
bch clean up linter warnings and unused variables
|
2022-11-04 17:42:45 -06:00 |
|
likho
|
4cac7645c8
|
WIP: Fix send
|
2022-11-01 12:46:29 +02:00 |
|
Marco
|
c0fddcd822
|
add litecoin support
|
2022-10-28 12:03:52 -06:00 |
|
Marco
|
4c4df1b618
|
before changes for litecoin
|
2022-10-27 17:24:14 -06:00 |
|
likho
|
401d4b568c
|
WIP: add particl
|
2022-10-26 19:55:32 +02:00 |
|
likho
|
b0cee75b76
|
Fix address error, remove bip84
|
2022-10-26 14:42:07 +02:00 |
|
likho
|
9baa30c1a4
|
REmove testnet
|
2022-10-26 10:52:02 +02:00 |
|
Likho
|
7e92be4b67
|
WIP: Add particle
|
2022-10-25 17:06:37 +02:00 |
|
julian
|
925d0a5096
|
Merge branch 'staging' into ui-fixes
|
2022-10-20 11:17:30 -06:00 |
|
julian
|
b6a2840368
|
check and update primary node if primary node is a default node that was updated
|
2022-10-20 11:01:25 -06:00 |
|
Marco
|
6cc0feb025
|
get rid of incorrect fatal error
|
2022-10-20 10:00:45 -06:00 |
|
Marco
|
b8836397a9
|
externalCalls set and db migration
|
2022-10-19 16:51:50 -06:00 |
|
Marco
|
27c2e38311
|
fix bitcoin cash tests
|
2022-10-19 16:16:00 -06:00 |
|
Marco
|
2a3997e837
|
refresh bitcoin cash cache if it has old data
|
2022-10-19 16:05:36 -06:00 |
|
Marco
|
46d5f26054
|
fix bitcoin cash null errors
|
2022-10-19 14:21:48 -06:00 |
|
Marco
|
d2120cd171
|
firo public send fix
|
2022-10-18 13:15:57 -06:00 |
|
Marco
|
604c2b4a63
|
increase firo mint search gap
|
2022-10-18 11:28:14 -06:00 |
|
julian
|
cd0fdad1f6
|
init prefs before doing any network calls
|
2022-10-18 10:36:25 -06:00 |
|
julian
|
e1e9cb7126
|
disable checking trade history for updates in incognito mode
|
2022-10-17 17:20:08 -06:00 |
|
Marco Salazar
|
9df7894142
|
Merge pull request #137 from cypherstack/ui-fixes
firo mint notification description
|
2022-10-15 16:53:54 -06:00 |
|
Marco
|
c7d4c4fc70
|
fix null error bug, firo restores faster again
|
2022-10-15 14:49:52 -06:00 |
|
julian
|
b4b9e09a0e
|
firo mint notification description
|
2022-10-15 11:57:00 -06:00 |
|
julian
|
8f2567f340
|
can exchange check updated
|
2022-10-14 12:21:00 -06:00 |
|
Marco
|
3c29b9acdf
|
temp fix for firo infinite fee estimate
|
2022-10-13 13:01:49 -06:00 |
|
Marco
|
764c66ee08
|
fix ui bug where chosen fee field doesnt show the updated user fee
|
2022-10-12 18:09:17 -06:00 |
|
Marco
|
2f7585a5e0
|
fix test
|
2022-10-12 10:26:14 -06:00 |
|
Marco
|
deec0cdddb
|
fix monero and wownero fee estimates for sending. fix some ui bugs
|
2022-10-11 19:54:50 -06:00 |
|
Marco
|
da941376be
|
fix monero and wownero sendall
|
2022-10-11 16:36:41 -06:00 |
|
Marco
|
7f8392522d
|
fully working setting with ease of use option, tests pass
|
2022-10-10 17:41:43 -06:00 |
|
Marco
|
5707a846b4
|
Merge branch 'staging' into testing-exchange
|
2022-10-10 11:59:33 -06:00 |
|
Marco
|
4339c19631
|
easy or more private option added at startup
|
2022-10-09 21:36:43 -06:00 |
|
Marco
|
e1e4100a6d
|
namecoin electrumx fixes
|
2022-10-07 11:50:26 -06:00 |
|
Marco
|
efe312c1f6
|
fix namecoin bug with getting address
|
2022-10-05 16:27:13 -06:00 |
|
julian
|
534034dcd3
|
Merge branch 'simpleswap' into testing-exchange
# Conflicts:
# pubspec.yaml
|
2022-10-04 18:59:41 -06:00 |
|
Marco Salazar
|
3b9082739c
|
fix ios wownero build fully
|
2022-10-04 17:44:59 -06:00 |
|
julian
|
1c0e023fca
|
simpleswap api call parse fix as well as ui trade exchange name fixes
|
2022-10-04 16:10:50 -06:00 |
|
Marco
|
956fa6a31c
|
make linux folder hidden
|
2022-10-04 12:41:48 -06:00 |
|
Marco
|
2de7692375
|
organize linux monero saves
|
2022-10-04 12:29:50 -06:00 |
|
julian
|
2c8ba8405f
|
added simpleswap data loading, cleaned up providers, modified exchange process
|
2022-10-04 11:06:14 -06:00 |
|
julian
|
9189754363
|
centralize changenow loading
|
2022-10-04 08:46:22 -06:00 |
|
julian
|
a8396977ef
|
changenow reverse fixed rate trade support
|
2022-10-03 18:55:12 -06:00 |
|
julian
|
bb12e149f6
|
exchange form state implementation and various small bug fixes
|
2022-10-03 18:01:04 -06:00 |
|
julian
|
d87c9981c6
|
changenow api fixes
|
2022-10-03 17:04:59 -06:00 |
|
julian
|
670c32aeaf
|
generic rate estimate
|
2022-10-03 10:30:50 -06:00 |
|
julian
|
c182557b30
|
generic market pair
|
2022-10-03 09:41:53 -06:00 |
|
julian
|
078259ec0f
|
cn trade hash fix
|
2022-10-03 07:59:59 -06:00 |
|
julian
|
58deb850f2
|
move from the changenow specific ExchangeTransaction model to Using the generic Trade model
|
2022-10-02 18:54:35 -06:00 |
|
julian
|
807379f112
|
generic changenow impl
|
2022-10-02 15:48:43 -06:00 |
|
julian
|
9af457d1c6
|
refactor changenow api
|
2022-10-02 15:03:40 -06:00 |
|
julian
|
cdcda481bf
|
changenow trade to generic trade db migration
|
2022-10-02 14:46:50 -06:00 |
|
julian
|
65cedbac02
|
simpleswap impl
|
2022-10-02 14:02:10 -06:00 |
|
julian
|
6126588e60
|
WIP simpleswap and generic exchange
|
2022-10-02 13:37:11 -06:00 |
|
julian
|
8243eb1a86
|
Don't ask android where to save
|
2022-09-30 18:46:52 -06:00 |
|
julian
|
02bc6060f5
|
wow min confirms updated to match standard network requirements
|
2022-09-30 17:00:21 -06:00 |
|
julian
|
2e2732ad2a
|
remove print
|
2022-09-29 08:53:12 -06:00 |
|
julian
|
6f594ade52
|
wownero 11 decimal places fixes
|
2022-09-28 17:15:16 -06:00 |
|
julian
|
80a7b3de8a
|
confirms null check
|
2022-09-28 09:46:46 -06:00 |
|
julian
|
7b3b7554b0
|
wownero node and ui fixes
|
2022-09-28 09:17:16 -06:00 |
|
julian
|
88653f96df
|
missing wow enum and price values
|
2022-09-27 10:27:51 -06:00 |
|
Marco
|
26b7306d22
|
Merge branch 'staging' into wow
# Conflicts:
# assets/images/wownero.png
# lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
# lib/services/coins/coin_service.dart
# lib/utilities/address_utils.dart
# lib/utilities/assets.dart
# lib/utilities/cfcolors.dart
# lib/utilities/constants.dart
# lib/utilities/default_nodes.dart
# lib/utilities/enums/coin_enum.dart
# pubspec.yaml
|
2022-09-27 16:16:20 +08:00 |
|
Marco
|
d3767ed31e
|
more wow fixes
|
2022-09-27 16:09:31 +08:00 |
|
julian
|
8e05d4ef56
|
various small bch fixes, temp disable tests
|
2022-09-26 14:44:07 -06:00 |
|
julian
|
57f0ea5ead
|
Merge branch 'desktop' into testing
# Conflicts:
# lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
# lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
# lib/utilities/text_styles.dart
# test/services/coins/bitcoincash/bitcoincash_wallet_test.dart
|
2022-09-26 14:35:58 -06:00 |
|
julian
|
84db4ac17f
|
enable bch
|
2022-09-26 14:32:53 -06:00 |
|
Likho
|
c0e80f828f
|
Merge remote-tracking branch 'origin/desktop' into add-p2sh-for-bch
|
2022-09-26 10:43:45 +02:00 |
|
Likho
|
04f80c61a5
|
WIP: Fix bch tests
|
2022-09-26 10:12:54 +02:00 |
|
julian
|
669001c921
|
nmc tx parse fix
|
2022-09-25 13:12:10 -06:00 |
|
julian
|
cf8b0ea83a
|
nmc tx parse fix
|
2022-09-25 13:11:10 -06:00 |
|
julian
|
617471d038
|
extra wallet management logging
|
2022-09-24 10:55:03 -06:00 |
|
julian
|
2d5b73c45e
|
firo private send vsize check
|
2022-09-24 10:55:01 -06:00 |
|
julian
|
963acb042d
|
extra wallet management logging
|
2022-09-24 10:17:34 -06:00 |
|
julian
|
5653bf173d
|
firo private send vsize check
|
2022-09-24 10:16:56 -06:00 |
|
julian
|
2e965e45ae
|
enable namecoin
|
2022-09-23 15:02:53 -06:00 |
|
Likho
|
d4cfea4bb7
|
WIP: Fix failing tests
|
2022-09-23 17:14:22 +02:00 |
|
julian
|
751b97caf6
|
temp tests fix
|
2022-09-23 08:03:52 -06:00 |
|
Likho
|
909436afdc
|
WIP: Add p2sh address for bch
|
2022-09-23 14:31:14 +02:00 |
|
julian
|
43b673ec0d
|
dark mode testing without partial nmc+bch
|
2022-09-22 18:06:19 -06:00 |
|
julian
|
888617c112
|
Merge branch 'testing' into desktop
|
2022-09-21 07:02:38 -06:00 |
|
julian
|
7646af0d73
|
updated btc test with hard data
|
2022-09-20 10:42:06 -06:00 |
|
Likho
|
8bb6ba6ab7
|
WIP: Update dust limit for nmc and bch, update nmc history data
|
2022-09-19 19:38:32 +02:00 |
|
julian
|
c3bbc624f7
|
added walletIds by coin getter function
|
2022-09-19 11:33:25 -06:00 |
|
Likho
|
25bcb9b94d
|
Merge remote-tracking branch 'origin/testing' into implement-name-coin
|
2022-09-19 15:39:41 +02:00 |
|
Likho
|
d032690101
|
WIP: Testing nmc and bch
|
2022-09-19 15:38:32 +02:00 |
|
julian
|
cd80e9f4d2
|
Merge branch 'implement-name-coin' into testing
|
2022-09-16 12:31:47 -06:00 |
|
Likho
|
f9c5859756
|
WIP: TEsting bch
|
2022-09-16 15:44:27 +02:00 |
|
Likho
|
aba579f64e
|
WIP: Fix bch failing tests, add testnet
|
2022-09-16 13:13:30 +02:00 |
|
Likho
|
2f5650ce30
|
WIP: BCH and NMC tests
|
2022-09-15 21:41:12 +02:00 |
|
julian
|
8b4215c6a1
|
Update required btc confirms to 1
|
2022-09-14 15:52:25 -06:00 |
|
Likho
|
c5ff6dfed5
|
Fix: Test sending and receiving
|
2022-09-13 20:18:45 +02:00 |
|
Marco
|
5bc4f25c15
|
namecoin receiving and sending
|
2022-09-13 21:12:21 +08:00 |
|
Likho
|
567d549747
|
WIP: Update namecoin network
|
2022-09-13 12:58:04 +02:00 |
|
julian
|
57ccfff34f
|
clear out null verified wallets on startup
|
2022-09-12 15:35:07 -06:00 |
|
julian
|
4ebda4ad21
|
updated doge tests to reflect speedup modifications
|
2022-09-12 11:35:26 -06:00 |
|
Likho
|
1419023ec9
|
Merge remote-tracking branch 'origin/ui-testing' into implement-name-coin
# Conflicts:
# test/cached_electrumx_test.mocks.dart
# test/electrumx_test.mocks.dart
# test/screen_tests/exchange/exchange_view_test.mocks.dart
# test/services/coins/manager_test.mocks.dart
|
2022-09-12 18:00:24 +02:00 |
|
julian
|
ea17eb5676
|
updated firo tests to reflect speedup modifications
|
2022-09-12 09:22:05 -06:00 |
|
julian
|
cdbce96f40
|
faster epic address loading
|
2022-09-12 07:26:06 -06:00 |
|
Likho
|
84694fa1dd
|
WIP: Add namecoin
|
2022-09-12 14:01:42 +02:00 |
|
Likho
|
6a418c4215
|
WIP : Adding name coin
|
2022-09-12 10:30:32 +02:00 |
|
Likho
|
25c395e070
|
Merge remote-tracking branch 'origin' into add-bitcoincash
|
2022-09-12 09:47:12 +02:00 |
|
julian
|
4ad5bd6e6d
|
linter warning clean up
|
2022-09-09 11:14:38 -06:00 |
|
julian
|
8556748517
|
Merge remote-tracking branch 'origin/speedup' into ui-testing
|
2022-09-09 10:54:00 -06:00 |
|
Marco
|
d8bc213749
|
between 2-4x speed increase for restore, first refresh, and nth refresh
|
2022-09-09 23:07:27 +08:00 |
|
julian
|
c18d456493
|
fix bug where wallet coin wouldn't be shown in exchange if changenow data failed to load before opening the exchange from within a wallet
|
2022-09-09 08:32:15 -06:00 |
|
julian
|
a67f6f97e9
|
infinite changenow loading fix
|
2022-09-09 08:03:36 -06:00 |
|
Likho
|
6fab5c9976
|
Add images for bch
|
2022-09-09 12:59:40 +02:00 |
|
julian
|
1e89f4e58b
|
fetch server cached anonymity sets for huge increase in firo restore speed
|
2022-09-08 14:02:07 -06:00 |
|
julian
|
94e6016f0a
|
Merge branch 'staging' into ui-testing
|
2022-09-08 10:56:36 -06:00 |
|
julian
|
0710b63129
|
changenow fixes and update fixed rate to be more accurate in displaying rates
|
2022-09-08 10:56:29 -06:00 |
|
Marco
|
519cba2b1e
|
get anon set http post call
|
2022-09-09 00:25:41 +08:00 |
|
Marco
|
d672c2bd17
|
send all for private funds in firo, and bug fix for failing to load wallets
|
2022-09-08 20:45:38 +08:00 |
|
julian
|
16cd9b6cee
|
received jsplit not showing as confirmed in ui fix
|
2022-09-07 16:14:10 -06:00 |
|
julian
|
88df57177b
|
public firo fee estimate and firo fee ui updates
|
2022-09-07 10:58:54 -06:00 |
|
julian
|
15c4d0e617
|
non lelantus firo sends
|
2022-09-07 09:56:10 -06:00 |
|
Likho
|
e365bb0c16
|
Update blockexplorer for bch and fix USD amount not showing in send view
|
2022-09-07 17:43:39 +02:00 |
|
julian
|
f8c8dcabfc
|
update btc dust limit
|
2022-09-07 08:20:32 -06:00 |
|
Marco
|
cbb3c3f241
|
bitcoin cash sending works for legacy and new addresses bip44
|
2022-09-07 20:54:18 +08:00 |
|
Likho
|
5cbaa597d3
|
Update bch network
|
2022-09-07 13:11:50 +02:00 |
|
julian
|
fbc398bc14
|
WIP firo redesign
|
2022-09-06 17:27:14 -06:00 |
|
julian
|
94941dfb94
|
bring back minting without automatically initiating it and do not merge mint transaction with receive
|
2022-09-06 15:55:01 -06:00 |
|
julian
|
7a23cfc4d2
|
extra balance getters in firo
|
2022-09-06 15:52:51 -06:00 |
|
julian
|
d2fbb7a4ba
|
clean up linter warnings and disable auto minting
|
2022-09-06 09:34:39 -06:00 |
|
Likho
|
d5b82f26f7
|
WIP: Add bitcoincash
|
2022-09-06 16:17:45 +02:00 |
|
julian
|
497e8791b0
|
Merge branch 'staging' into ui-testing
|
2022-09-06 07:37:50 -06:00 |
|
Marco
|
88bc15fcd3
|
firo anonymity set mint saving error
|
2022-09-06 19:47:57 +08:00 |
|
julian
|
d6618518ad
|
receive screen redesign and added generate new address button
|
2022-09-05 19:18:45 -06:00 |
|
julian
|
57814fab4b
|
remove redundant null check operator
|
2022-09-03 11:51:08 -06:00 |
|
Likho
|
9d68ffe6b2
|
Fix HTTP send dart errors
|
2022-09-01 17:02:22 -05:00 |
|
Likho
|
b076e76881
|
Resolve merge conflicts with staging
|
2022-09-01 16:29:00 -05:00 |
|
Likho
|
cfcd7a7928
|
Implement HTTP sending and use Julian's error checking
|
2022-09-01 16:17:46 -05:00 |
|
Likho
|
91b4fdf450
|
Merge remote-tracking branch 'origin/staging' into open-wallet-and-store
|
2022-09-01 11:07:40 -05:00 |
|
julian
|
ffef1011c1
|
epic http address support in ui and some async lint fixes
|
2022-09-01 08:48:52 -06:00 |
|
julian
|
2e459ffb9f
|
add an await in btc rescan
|
2022-08-31 12:49:44 -06:00 |
|
julian
|
8b3c15ca9e
|
log level fix
|
2022-08-31 12:28:47 -06:00 |
|
julian
|
f63c5e5cc7
|
add some detail to logging
|
2022-08-31 11:49:19 -06:00 |
|
julian
|
71826d4da3
|
refactor ChangeNow for easier testability
|
2022-08-30 16:38:07 -06:00 |
|
julian
|
549e587b3b
|
finished basic change_now.dart tests
|
2022-08-30 14:41:16 -06:00 |
|
Likho
|
3ef6bf3b30
|
Merge branch 'main' into open-wallet-and-store
|
2022-08-30 08:22:42 -05:00 |
|
Likho
|
0eaf4eb5e2
|
Clean up logs
|
2022-08-30 08:00:23 -05:00 |
|
Likho
|
345889c566
|
Delete already processed slate
|
2022-08-30 07:57:48 -05:00 |
|
Likho
|
652da68e25
|
Open wallet once and store instrance
|
2022-08-30 07:26:45 -05:00 |
|
Rylee Davis
|
c40f7c0e90
|
Merge pull request #11 from cypherstack/ui-testing
fix firo double-or-int parse bug
|
2022-08-29 17:45:37 -06:00 |
|
julian
|
47bd246c7b
|
fix firo double-or-int parse bug
|
2022-08-29 17:29:38 -06:00 |
|
julian-CStack
|
11415d0678
|
Merge pull request #10 from cypherstack/ui-testing
exchange serialization bugfix and partial test coverage
|
2022-08-29 15:34:10 -06:00 |
|
julian
|
6b534a4247
|
possible workflow tests fix
|
2022-08-29 15:20:27 -06:00 |
|
julian
|
ba576c06eb
|
exchange serialization bugfix and partial test coverage
|
2022-08-29 14:47:38 -06:00 |
|
ryleedavis
|
3764494832
|
Merge branch 'staging' into rylee-tmp
|
2022-08-29 12:42:34 -06:00 |
|
julian
|
1aef4cd43c
|
possible firo tests threading fix
|
2022-08-29 09:02:06 -06:00 |
|
Marco
|
7bd2b6b38a
|
fixes firo but removes firo testnet
|
2022-08-29 21:50:02 +08:00 |
|
Marco
|
63231c242b
|
fully fix monero UI issues
|
2022-08-28 20:00:30 +08:00 |
|
Marco
|
795626af7e
|
UI bugfix for monero
|
2022-08-28 12:14:42 +08:00 |
|
Marco
|
0de35c249c
|
possible fix for monero syncing bug
|
2022-08-28 00:06:04 +08:00 |
|
ryleedavis
|
56150fda5c
|
adjusted node info
|
2022-08-26 12:47:47 -06:00 |
|
Marco
|
b41d31fd32
|
first commit
|
2022-08-26 16:11:35 +08:00 |
|