Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Personal Tokens #7212

Merged
merged 178 commits into from
Sep 29, 2020
Merged
Show file tree
Hide file tree
Changes from 153 commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
f331c35
Setup ptokens and add pages
iamonuwa May 16, 2020
2e0d89b
Update link
iamonuwa May 16, 2020
efc9e86
Update links
iamonuwa May 16, 2020
ae5a819
Add dashboard route
iamonuwa May 17, 2020
3cab1fe
Merge branch 'feat/quickstart' of github.com:iamonuwa/web into feat/q…
iamonuwa May 17, 2020
ada5c20
Update buy tokens disclaimer to italics
iamonuwa May 18, 2020
cb5d481
Add disclaimer text to quickstart
iamonuwa May 18, 2020
3e860bb
Add Proof Token stats card
iamonuwa May 18, 2020
56a9ba7
Add modal
iamonuwa May 18, 2020
84de5c2
Made css fixes
iamonuwa May 18, 2020
f6464f0
Add modal files
iamonuwa May 18, 2020
1677df1
Update faq link
iamonuwa May 18, 2020
45f7716
Setup ptokens and add pages (#20)
iamonuwa May 18, 2020
4f5b1be
Add modals to p tokens
iamonuwa May 19, 2020
78a5df3
Add redeem token button
iamonuwa May 19, 2020
bc17020
Add tokens page
iamonuwa May 21, 2020
83c834e
Add dashboard UI
iamonuwa May 26, 2020
e182f6a
Merge branch 'master' into staging
proofoftom May 26, 2020
4b6a46c
Add token model
iamonuwa May 27, 2020
1ae8b6b
update wording and layout #16
dekanbro May 28, 2020
326a04d
move second faq inside container
dekanbro May 28, 2020
ad2865e
Merge branch 'profile-ptoken-section' into ptokens-dashboard
proofoftom May 28, 2020
642eecc
WIP Create a token modal
proofoftom May 28, 2020
864b92d
Add createPToken function
proofoftom May 31, 2020
a75cc75
Merge branch 'master' into staging
proofoftom May 31, 2020
827631f
Create new ptoken on chain
proofoftom Jun 1, 2020
f37ea9b
Add new model to redemptions
zoek1 Jun 3, 2020
48917e6
Add endpoints to manage ptokens and redemptions
zoek1 Jun 3, 2020
fbf7a32
Add card for ptoken actions
zoek1 Jun 3, 2020
b3c4f12
Add routes and migrations
zoek1 Jun 3, 2020
b968500
Merge branch 'master' into staging
proofoftom Jun 5, 2020
a8173a2
Add purchase and redemptions flow
zoek1 Jun 7, 2020
b19f8cc
Add list redmeptions per state
zoek1 Jun 7, 2020
c1c95d5
Change profile reference to foreign keys
zoek1 Jun 7, 2020
1ec2450
Add changes based on teams feedback
zoek1 Jun 8, 2020
da1a009
Merge pull request #28 from zoek1/ptokens-dashboard
proofoftom Jun 9, 2020
33bbe97
Integrate ptokens-dashboard
zoek1 Jun 9, 2020
acbff42
Merge branch 'staging' of https://github.com/raid-guild/gitcoinco-web…
zoek1 Jun 9, 2020
e283b44
Redo migration history
zoek1 Jun 9, 2020
67e774e
Wire redemptions instead of general tokens
zoek1 Jun 9, 2020
7df3871
Merge branch 'ptokens-dashboard' into staging
proofoftom Jun 9, 2020
d6b8a20
Merge commit '67e774e2ffcf447543a587d8562d3409cc64228e' into staging
proofoftom Jun 9, 2020
f3835e3
Update quickstart tab title
iamonuwa Jun 10, 2020
ad9c768
Fix loading error
iamonuwa Jun 11, 2020
dec595c
Merge branch 'master' into staging
proofoftom Jun 11, 2020
7dcb3cc
Merge pull request #25 from raid-guild/chore/buy-a-token
proofoftom Jun 11, 2020
82d9498
update ptoken script
iamonuwa Jun 14, 2020
61a5430
update modals
iamonuwa Jun 14, 2020
310aaef
merge
iamonuwa Jun 14, 2020
1bc6497
Add contracts and add ptoken as an env
zoek1 Jun 15, 2020
e93f706
FIx error on parse contract
zoek1 Jun 15, 2020
03624c3
Merge pull request #33 from raid-guild/feature/add-contracts
proofoftom Jun 17, 2020
c898a9b
working on "personal tokens" filter
vporton Jun 9, 2020
5b3230e
"personal tokens" filter implemented
vporton Jun 9, 2020
9ee869e
model changes
vporton Jun 9, 2020
321cae3
rebased and fixed migrations
vporton Jun 17, 2020
8843fcd
Merge branch 'staging' into feat/quickstart
iamonuwa Jun 17, 2020
c5b5bf0
Merge pull request #30 from vporton/ptoken-filter
proofoftom Jun 18, 2020
2a7495a
Merge pull request #32 from iamonuwa/feat/quickstart
proofoftom Jun 18, 2020
fdd736b
Merge branch 'staging' of github.com:raid-guild/gitcoinco-web into st…
iamonuwa Jun 18, 2020
db305a3
update createtoken
iamonuwa Jun 18, 2020
52ad099
add create token
iamonuwa Jun 18, 2020
cd62be1
Connect createPToken on Dashboard and do some cleanup
proofoftom Jun 18, 2020
60d4055
stupid abi
proofoftom Jun 19, 2020
20fd332
Revert "stupid abi"
proofoftom Jun 20, 2020
b3993e7
Merge branch 'feature/create-tokens' into staging
proofoftom Jun 20, 2020
c56b04e
add token to profile card
iamonuwa Jun 18, 2020
d53d328
Update create ptokens
iamonuwa Jun 19, 2020
e5cb868
add create_ptokens to db
iamonuwa Jun 20, 2020
8a05792
Use create_tokens from ptokens.js; other cleanup
proofoftom Jun 21, 2020
c588387
WIP web3 and DB logic for buying and redeeming pTokens
proofoftom Jun 21, 2020
b8a485d
Add token info on profile
zoek1 Jun 22, 2020
3d842f3
Add current ptoken vars on profile
zoek1 Jun 22, 2020
750ff4e
Update profile card with real ptoken info
zoek1 Jun 22, 2020
111580d
Crontask to update tx status for ptokens and related models
zoek1 Jun 23, 2020
e26e5cb
Have button on profile lead to quickstart
proofoftom Jun 24, 2020
7f442f6
Merge pull request #34 from raid-guild/feature/buy-redeem-tokens
proofoftom Jun 24, 2020
2908081
Fix error saving created token to database
proofoftom Jun 24, 2020
56e3d9c
Add token display fix on profile
zoek1 Jun 25, 2020
1a1ca10
Merge pull request #35 from raid-guild/fix/token_display
proofoftom Jun 26, 2020
bd984fe
Merge branch 'master' into fork/staging
proofoftom Jun 26, 2020
a88bff0
Revert "Merge branch 'master' into fork/staging"
proofoftom Jun 26, 2020
6ed5fb7
Update based on QA test
zoek1 Jun 28, 2020
ed5891d
Merge pull request #36 from raid-guild/fix/qa-token-display
proofoftom Jun 29, 2020
04c0042
Merge branch 'staging' of https://github.com/raid-guild/gitcoinco-web…
proofoftom Jun 29, 2020
00f39ed
Revert "Revert "Merge branch 'master' into fork/staging""
proofoftom Jun 29, 2020
a6a5a2b
fix migrations
zoek1 Jun 29, 2020
6be83bf
Add fixes for modals and add validations
zoek1 Jul 1, 2020
40a7ed5
Merge pull request #37 from raid-guild/fix/modals-validations
proofoftom Jul 3, 2020
462e383
Update based on QA document
zoek1 Jul 5, 2020
e37e06b
Add edit ptoken modal
zoek1 Jul 5, 2020
974a53a
Fix Nonetype error
zoek1 Jul 6, 2020
418bb5a
Merge pull request #39 from raid-guild/fix/qa-testing-2
proofoftom Jul 6, 2020
bad39ac
Updates so user can deploy their own personal token
mds1 Jul 4, 2020
b4ec2ce
Clarify variable names
mds1 Jul 6, 2020
2ff2be1
Add missing indicateMetamaskPopup calls
mds1 Jul 6, 2020
c8f734b
Fix bug that logged incorrect minted value to DB
mds1 Jul 6, 2020
167980f
Merge pull request #38 from ScopeLift/setup-deployment
proofoftom Jul 6, 2020
ef9f1ad
Save network to DB when ptoken is created
mds1 Jul 6, 2020
b116f8e
ptoken addresses are now updated via cronjob
mds1 Jul 6, 2020
ed04b38
Token price can now be updated
mds1 Jul 7, 2020
7bb4a37
Token supply can now be updated
mds1 Jul 7, 2020
6b0855f
Fix ptoken display and available amount
zoek1 Jul 7, 2020
33a62e0
Fix error handling and token creation
mds1 Jul 7, 2020
3980425
Merge pull request #40 from ScopeLift/support-token-editing
proofoftom Jul 7, 2020
b4fa9ba
Wire buy functionality
zoek1 Jul 12, 2020
ae72605
clean logs
zoek1 Jul 12, 2020
c363aeb
Add buy card for ptoken
zoek1 Jul 12, 2020
51b0128
Merge pull request #42 from raid-guild/feature/wire-buy-token
proofoftom Jul 13, 2020
1873399
Fix bugs in buy ptoken flow
mds1 Jul 15, 2020
68717e7
Setup required checks for redeem flow
mds1 Jul 15, 2020
97ce6c2
Include description with redemption requests
mds1 Jul 15, 2020
557c343
Add web3 function for completing ptoken redemption
mds1 Jul 15, 2020
91f08b6
Merge pull request #43 from ScopeLift/add-redeem-functionality
proofoftom Jul 16, 2020
883f47d
Fix exceptions on dislpaying cards
zoek1 Jul 16, 2020
5ea9cd7
Update variable for open requests
zoek1 Jul 17, 2020
4440b62
Merge pull request #44 from raid-guild/fix-dashboard-cards
proofoftom Jul 17, 2020
431079e
Wire cancell and complete action at the dashboard
zoek1 Jul 20, 2020
b0116ba
Add cancelled section and fix copy
zoek1 Jul 20, 2020
fa11a02
Update phrasing in create pToken error message
mds1 Jul 20, 2020
557c4f1
Merge pull request #46 from raid-guild/feature/wire-dashboard
proofoftom Jul 21, 2020
aec8890
New rinkeby ptoken factory, update DAI address to use Compound's
mds1 Jul 17, 2020
fda1cb0
Lots of QA improvements
mds1 Jul 22, 2020
19dea99
Merge pull request #47 from ScopeLift/qa-cleanup
proofoftom Jul 22, 2020
b7c8668
Sync token and balances with the blockchain
zoek1 Jul 24, 2020
3f31af7
fix wrong attribute error
zoek1 Jul 24, 2020
487d42f
Merge pull request #48 from raid-guild/feature/sync-token-info
proofoftom Jul 26, 2020
c8744bf
Frontend can trigger DB updates when pToken txs are mined
mds1 Jul 26, 2020
dfd0f2f
Merge pull request #49 from ScopeLift/fix-frontend-tx-recognition
proofoftom Jul 27, 2020
623c38f
Disable profile redeem button if user holds no ptokens of that user
mds1 Jul 29, 2020
e489c3b
After creating a ptoken, congratulations modal is now shown
mds1 Jul 29, 2020
ce544ce
Check for valid web3 and network when purchasing a pToken
mds1 Jul 29, 2020
26719b9
Improve form validation when buying a pToken
mds1 Jul 29, 2020
3d57f95
Improve redemption request flow UX
mds1 Jul 29, 2020
aac0ef9
Improve error handling of Create pToken flow
mds1 Jul 29, 2020
8feb3dd
Update purchase copy
proofoftom Jul 30, 2020
41759be
Merge pull request #50 from ScopeLift/matt-qa-updates
proofoftom Jul 30, 2020
deb5f69
Sync price, supply and other QA stuff
zoek1 Jul 31, 2020
c4d3239
Update sync data in profile
zoek1 Jul 31, 2020
70c5498
Make dashboard reactive when creating a ptoken
mds1 Jul 31, 2020
d2b38c1
Various fixes to redemption approval
mds1 Jul 31, 2020
c992831
Fix: No longer shows NaN in buy/redeem modal when value is empty
mds1 Jul 31, 2020
698c6cd
Add validation to the Create pToken modal
mds1 Jul 31, 2020
05073e6
Spelling/copy fixes w/ some eslint additions
proofoftom Aug 2, 2020
044c782
Merge pull request #51 from raid-guild/fix/sync-events
proofoftom Aug 2, 2020
f17beee
Disable buy button if there are zero ptokens available for purchase
mds1 Aug 3, 2020
feac412
Add confirmation modals for Cancellation and Completetion flows
mds1 Aug 3, 2020
b4dc0cc
Update purchase flow so user is not immediately taken to redemption d…
mds1 Aug 3, 2020
7c7d935
fix card messages
zoek1 Aug 6, 2020
354a05e
Remove cost from redeem modal
mds1 Aug 14, 2020
c6a44ff
Emails and notifications for ptoken events
zoek1 Aug 10, 2020
942796c
Merge pull request #53 from raid-guild/feature/notif-and-emails
proofoftom Aug 18, 2020
2062e92
Merge branch 'master' into staging
mds1 Aug 19, 2020
0638a22
Merge branch 'master' into staging
zoek1 Aug 25, 2020
6dc76c8
Squash migrations for ptokens
zoek1 Aug 25, 2020
34f5514
Update text on cards
zoek1 Aug 25, 2020
eafc1f8
Update redeem button based on backend status
zoek1 Aug 26, 2020
502a56e
Various styling, UX, and phrasing updates
mds1 Aug 26, 2020
7481f79
Updates to the redemption flow
mds1 Aug 26, 2020
42f0c5a
Close redemption modal when tx is mined, and update its phrasing
mds1 Aug 26, 2020
3f8b485
Verify Name and symbol to avoid collitions
zoek1 Sep 1, 2020
cbc90fa
Merge pull request #54 from raid-guild/fix/redeem
mds1 Sep 1, 2020
d99a340
Merge branch 'master' into staging
mds1 Sep 1, 2020
d248e01
Update Terms of Service
mds1 Sep 1, 2020
2692d9f
Merge branch 'master' into staging
zoek1 Sep 4, 2020
7f56c2d
qa fixes
zoek1 Sep 4, 2020
45549af
Merge branch 'master' into staging
zoek1 Sep 4, 2020
66ab2e0
Add migrations
zoek1 Sep 4, 2020
b666139
Merge pull request #55 from raid-guild/update-tos
mds1 Sep 4, 2020
daaa163
Merge branch 'master' into staging
mds1 Sep 4, 2020
ddb04f7
fix eslint
zoek1 Sep 4, 2020
b92b781
Merge branch 'staging' of github.com:raid-guild/gitcoinco-web into st…
zoek1 Sep 4, 2020
0ad6778
Merge branch 'master' into staging
mds1 Sep 7, 2020
f083844
Merge branch 'gitcoinco:master' into staging-rg
mds1 Sep 28, 2020
587aab5
Update migrations
mds1 Sep 28, 2020
ee237cb
Update terms
mds1 Sep 28, 2020
12c58a4
Update pToken factory with final address
mds1 Sep 29, 2020
b28393b
isort fixes
thelostone-mc Sep 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/app/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from kudos.models import KudosTransfer
from marketing.utils import handle_marketing_callback
from perftools.models import JSONStore
from ptokens.models import PersonalToken
from retail.helpers import get_ip
from townsquare.models import Announcement

Expand Down Expand Up @@ -74,6 +75,7 @@ def preprocess(request):
chat_url = get_chat_url(front_end=True)
chat_access_token = ''
chat_id = ''
ptoken = None

user_is_authenticated = request.user.is_authenticated
profile = request.user.profile if user_is_authenticated and hasattr(request.user, 'profile') else None
Expand Down Expand Up @@ -115,6 +117,9 @@ def preprocess(request):

chat_access_token = profile.gitcoin_chat_access_token
chat_id = profile.chat_id

ptoken = PersonalToken.objects.filter(token_owner_profile=profile).first()

# handles marketing callbacks
if request.GET.get('cb'):
callback = request.GET.get('cb')
Expand Down Expand Up @@ -175,6 +180,11 @@ def preprocess(request):
'pref_do_not_track': profile.pref_do_not_track if profile else False,
'profile_url': profile.url if profile else False,
'quests_live': settings.QUESTS_LIVE,
'ptoken_abi': settings.PTOKEN_ABI,
'ptoken_factory_address': settings.PTOKEN_FACTORY_ADDRESS,
'ptoken_factory_abi': settings.PTOKEN_FACTORY_ABI,
'ptoken_address': ptoken.token_address if ptoken else '',
'ptoken_id': ptoken.id if ptoken else None
}
context['json_context'] = json.dumps(context)
context['last_posts'] = cache.get_or_set('last_posts', fetchPost, 5000)
Expand Down
2 changes: 1 addition & 1 deletion app/app/fixtures/economy.json
Original file line number Diff line number Diff line change
Expand Up @@ -24320,7 +24320,7 @@
"fields": {
"created_on": "2019-09-09T00:52:18Z",
"modified_on": "2019-09-11T01:38:48.009Z",
"address": "0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D",
"address": "0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa",
"symbol": "DAI",
"network": "rinkeby",
"decimals": 18,
Expand Down
10 changes: 5 additions & 5 deletions app/app/fixtures/grants.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"contract_owner_address": "0xBcAfdD642118e5536024675e776d32413728dd08",
"monthly_amount_subscribed": "0.0000",
"amount_received": "5.0000",
"token_address": "0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D",
"token_address": "0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa",
"token_symbol": "DAI",
"contract_address": "0x3DDDC3Bedc5e9E65139d3Ee89E25fa32022dbE2f",
"deploy_tx_id": "0x4bfa9e3469d8e5feb66ee00f94b7eea7b0d3518bee00a797c2d8cb52a7b39c3c",
Expand Down Expand Up @@ -120,7 +120,7 @@
"real_period_seconds": "0",
"frequency_unit": "days",
"frequency": "30",
"token_address": "0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D",
"token_address": "0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa",
"token_symbol": "DAI",
"gas_price": "250.0000",
"new_approve_tx_id": "0xd89376ee2a96557f4e9038ae59610b590987e48994d45b55ba6588e171d0678b",
Expand Down Expand Up @@ -152,7 +152,7 @@
"real_period_seconds": "2592000",
"frequency_unit": "days",
"frequency": "30",
"token_address": "0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D",
"token_address": "0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa",
"token_symbol": "DAI",
"gas_price": "2500.0000",
"new_approve_tx_id": "0x49d52af7bdfaf14224f22f6466550ca61b8261593e68be4bd11ac42ddafcf99a",
Expand Down Expand Up @@ -184,7 +184,7 @@
"real_period_seconds": "0",
"frequency_unit": "days",
"frequency": "30",
"token_address": "0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D",
"token_address": "0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa",
"token_symbol": "DAI",
"gas_price": "250.0000",
"new_approve_tx_id": "0x723b608a34521a9ddade1cc8d8f2b720edddd1db7dd2c2fdeb04b046fab32251",
Expand Down Expand Up @@ -216,7 +216,7 @@
"real_period_seconds": "2592000",
"frequency_unit": "days",
"frequency": "30",
"token_address": "0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D",
"token_address": "0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa",
"token_symbol": "DAI",
"gas_price": "25000.0000",
"new_approve_tx_id": "0x980ce738853f454c83d5551dc086a29d2d89781fb041a9ce581474ffdf639de4",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ could we undo all these changes

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment #7212 (comment) — I think we should keep these changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gotcha

Expand Down
17 changes: 16 additions & 1 deletion app/app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.

"""
import json
import os
import socket

Expand Down Expand Up @@ -104,6 +105,7 @@
'app',
'avatar',
'retail',
'ptokens',
'rest_framework',
'marketing',
'economy',
Expand Down Expand Up @@ -178,7 +180,7 @@

TEMPLATES = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ['chat/templates/', 'retail/templates/', 'dataviz/templates', 'kudos/templates', 'inbox/templates', 'quests/templates', 'townsquare/templates'],
'DIRS': ['chat/templates/', 'retail/templates/', 'dataviz/templates', 'kudos/templates', 'inbox/templates', 'quests/templates', 'townsquare/templates', 'ptokens/templates'],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down Expand Up @@ -822,6 +824,19 @@ def callback(request):


ELASTIC_SEARCH_URL = env('ELASTIC_SEARCH_URL', default='')
PTOKEN_ABI_PATH = env('PTOKEN_ABI_PATH', default='assets/v2/js/ptokens/ptoken-abi.json')
PTOKEN_FACTORY_ABI_PATH = env('PTOKEN_FACTORY_ABI_PATH', default='assets/v2/js/ptokens/factory-abi.json')
PTOKEN_FACTORY_ADDRESS = env('PTOKEN_FACTORY_ADDRESS', default='0x6D8A1a2Dc7A80e2D0cEf6E8f30397d692D6329c0')
PTOKEN_ABI = ''
PTOKEN_FACTORY_ABI = ''

if PTOKEN_ABI_PATH:
with open(str(root.path(PTOKEN_ABI_PATH))) as f:
PTOKEN_ABI = json.load(f)

if PTOKEN_FACTORY_ABI_PATH:
with open(str(root.path(PTOKEN_FACTORY_ABI_PATH))) as f:
PTOKEN_FACTORY_ABI = json.load(f)

account_sid = env('TWILIO_ACCOUNT_SID', default='')
auth_token = env('TWILIO_AUTH_TOKEN', default='')
Expand Down
14 changes: 14 additions & 0 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import quests.views
import retail.emails
import retail.views
import ptokens.views
import revenue.views
import search.views
import tdi.views
Expand Down Expand Up @@ -79,6 +80,19 @@
# board
re_path(r'^dashboard/?', dashboard.views.board, name='dashboard'),

# personal_tokens
re_path(r'^ptoken/quickstart/?', ptokens.views.quickstart, name='ptoken_quickstart'),
re_path(r'^ptoken/faq/?', ptokens.views.faq, name='ptokens_faq'),
path('ptokens/redemptions/<int:redemptionId>/', ptokens.views.ptoken_redemption, name='token_redemption'),
path('ptokens/<int:tokenId>/purchase/', ptokens.views.ptoken_purchases, name='token_purchase'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is tokenId camelCase when everything else is snake_case? Just wondering, maybe I'm missing something

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with redemptionId

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 34f5514

path('ptokens/<int:tokenId>/redemptions/', ptokens.views.ptoken_redemptions, name='token_redemptions'),
path('ptokens/redemptions/<str:redemption_state>/', ptokens.views.ptoken_redemptions, name='token_redemptions'),
path('ptokens/me/', ptokens.views.ptoken, name='personal_token'),
path('ptokens/<int:tokenId>/', ptokens.views.ptoken, name='token'),
path('ptokens/<str:token_state>/', ptokens.views.tokens, name='tokens'),
path('ptokens/', ptokens.views.tokens, name='tokens'),
path('ptokens/update', ptokens.views.process_ptokens, name='process_ptokens'),

# kudos
re_path(r'^kudos/?$', kudos.views.about, name='kudos_main'),
re_path(r'^kudos/about/?$', kudos.views.about, name='kudos_about'),
Expand Down
Binary file added app/assets/v2/images/ptoken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/v2/js/abi.js

Large diffs are not rendered by default.

Loading