Commit Graph

335 Commits

Author SHA1 Message Date
0ee8c7e6c8 Merge branch 'bvander/minor-auth-messages' into 'master'
Auth error messages to user

See merge request grassrootseconomics/cic-staff-client!39
2021-06-30 15:57:16 +00:00
09c45aa2e5 messages 2021-06-30 08:53:31 -07:00
a070cbe710 Update .gitlab-ci.yml 2021-06-24 21:52:40 +00:00
542af155f7 Update .gitlab-ci.yml 2021-06-24 17:18:52 +00:00
8668d63994 Update environment.dev.ts 2021-06-24 17:14:50 +00:00
Spencer Ofwiti
e0a44046da Merge branch 'spencer/refactor-mappings' into 'master'
Refactor mapping of curated options from meta.

See merge request grassrootseconomics/cic-staff-client!37
2021-06-23 07:18:29 +00:00
Spencer Ofwiti
5e8e0f7209 Refactor mapping of curated options from meta. 2021-06-23 07:18:28 +00:00
a69213dab2 Merge branch 'bvander/refactor-registry-service' into 'master'
refactor registry service

See merge request grassrootseconomics/cic-staff-client!34
2021-06-22 20:49:25 +00:00
f13ae6dd2a refactor registry service 2021-06-22 20:49:25 +00:00
Spencer Ofwiti
91b50f68f1 Merge branch 'spencer/meta-update' into 'master'
Fix meta update process

See merge request grassrootseconomics/cic-staff-client!36
2021-06-15 16:49:27 +00:00
Spencer Ofwiti
2d76f63442 Fix meta update process 2021-06-15 16:49:26 +00:00
Spencer Ofwiti
250d44e9a4 Merge branch 'spencer/precommit-hooks' into 'master'
Add precommit hooks

See merge request grassrootseconomics/cic-staff-client!35
2021-06-15 16:37:33 +00:00
Spencer Ofwiti
6a1ca3d4a0 Add precommit hooks 2021-06-15 16:37:33 +00:00
Spencer Ofwiti
5295e47cc1 Merge branch 'spencer/keystore-singleton' into 'master'
Refactor keystore into singleton service.

See merge request grassrootseconomics/cic-staff-client!31
2021-06-15 16:22:02 +00:00
Spencer Ofwiti
85e41e99b0 Add promises to keystore singleton service. 2021-06-14 17:50:39 +03:00
Spencer Ofwiti
8b1de5dcb5 Merge branch 'master' into spencer/keystore-singleton
# Conflicts:
#	src/app/_services/transaction.service.ts
2021-06-14 16:37:21 +03:00
Spencer Ofwiti
6901c7b0f2 Merge branch 'spencer/docs' into 'master'
Add comprehensive documentation.

See merge request grassrootseconomics/cic-staff-client!18
2021-06-14 11:44:06 +00:00
Spencer Ofwiti
4ed3d108cb Update docs. 2021-06-14 14:28:53 +03:00
Spencer Ofwiti
7923c63aa8 Merge branch 'master' into spencer/docs
# Conflicts:
#	package-lock.json
2021-06-14 14:16:21 +03:00
Spencer Ofwiti
84a50ed814 Merge branch 'spencer/token-balance' into 'master'
Fix token service queries.

See merge request grassrootseconomics/cic-staff-client!28
2021-06-14 11:15:01 +00:00
Spencer Ofwiti
b230cdac39 Format code using linter. 2021-06-14 14:08:58 +03:00
Spencer Ofwiti
bb364fb6c9 Merge branch 'master' into spencer/token-balance 2021-06-14 14:03:34 +03:00
d7c0baad63 Merge branch 'bvander/private-key-noauth' into 'master'
private key go to login

See merge request grassrootseconomics/cic-staff-client!33
2021-06-12 16:55:42 +00:00
71c56392e9 Merge branch 'revert-a93be027' into 'master'
Revert "Merge branch 'bvander/loading-registries' into 'master'"

See merge request grassrootseconomics/cic-staff-client!32
2021-06-12 16:22:10 +00:00
06ddf4cb0f Revert "Merge branch 'bvander/loading-registries' into 'master'"
This reverts merge request !29
2021-06-12 16:21:45 +00:00
f4b36a0db8 private key go to login 2021-06-12 09:18:17 -07:00
a93be027c6 Merge branch 'bvander/loading-registries' into 'master'
refactor token service to use the token registry

See merge request grassrootseconomics/cic-staff-client!29
2021-06-12 15:08:10 +00:00
Spencer Ofwiti
df008fcace Refactor keystore into singleton service. 2021-06-11 16:57:16 +03:00
Spencer Ofwiti
02b98a46ca Refactor loading of tokens in token component. 2021-06-11 11:29:55 +03:00
Spencer Ofwiti
a2ee2ae071 Add account registry getter in registry service. 2021-06-11 10:56:55 +03:00
Spencer Ofwiti
190d36254a Update dependencies. 2021-06-11 10:05:12 +03:00
Spencer Ofwiti
0866c4c22f Format files using linter. 2021-06-11 09:26:50 +03:00
df395b7b61 login button was taking two clicks 2021-06-10 15:59:11 -07:00
61bf336789 refactor token service to use the token registry 2021-06-10 13:56:47 -07:00
Spencer Ofwiti
d90ab9f375 Update cic-client library. 2021-06-10 18:40:45 +03:00
Spencer Ofwiti
aebb0bdd4d Update ERC20 contract ABI. 2021-06-10 17:46:07 +03:00
Spencer Ofwiti
c0c94d3e2d Lint changes from master. 2021-06-10 17:29:23 +03:00
Spencer Ofwiti
157f88b052 Merge branch 'master' into spencer/token-balance 2021-06-10 17:20:06 +03:00
060c47f840 Merge branch 'bvander/auth-flow' into 'master'
auth flow fixes

See merge request grassrootseconomics/cic-staff-client!27
2021-06-10 14:18:53 +00:00
90c0836eee auth component logging and error handling 2021-06-09 17:07:25 -07:00
849f60307e log error 2021-06-09 15:16:55 -07:00
9989262d7c Merge branch 'master' into bvander/auth-flow 2021-06-09 10:40:18 -07:00
Spencer Ofwiti
156e937bc6 Remove onload event. 2021-06-09 19:37:05 +03:00
Spencer Ofwiti
9439e25370 Add type to token service load subject. 2021-06-09 18:52:59 +03:00
Spencer Ofwiti
71fc96bfe1 Add display of token balance together with token amount. 2021-06-09 18:04:29 +03:00
Spencer Ofwiti
c86dde1311 Merge branch 'master' into spencer/docs
# Conflicts:
#	src/app/_eth/accountIndex.ts
#	src/app/_eth/token-registry.ts
#	src/app/_helpers/mock-backend.ts
#	src/app/_models/token.ts
#	src/app/_pgp/pgp-key-store.ts
2021-06-09 08:47:42 +03:00
Spencer Ofwiti
1dc751f15f Merge branch 'spencer/fix-account-index' into 'master'
Fix account index out of index error.

See merge request grassrootseconomics/cic-staff-client!23
2021-06-09 05:20:44 +00:00
a9763f9109 auth flow fixes 2021-06-08 17:59:01 -07:00
Spencer Ofwiti
9363532284 Remove forceful parsing to JSON format. 2021-06-04 15:16:57 +03:00
Spencer Ofwiti
3831694d3e Refactor token list to use Observables for tracking changes. 2021-06-04 11:01:20 +03:00