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

Timezone Record Parsing #568

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/specs/stateful/profile.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const profiles = [
{
type: 'account',
key: 'com.discord',
value: 'ens#0700',
value: 'nickjohnson',
},
{
type: 'account',
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"@tanstack/query-sync-storage-persister": "4.29.1",
"@tanstack/react-query": "4.29.1",
"@tanstack/react-query-persist-client": "4.29.1",
"@types/luxon": "^3.3.1",
"@wagmi/core": "0.10.11",
"calendar-link": "^2.2.0",
"dns-packet": "^5.4.0",
Expand All @@ -94,6 +95,7 @@
"intl-segmenter-polyfill": "^0.4.4",
"iso-639-1": "^2.1.15",
"lodash": "^4.17.21",
"luxon": "^3.4.0",
"markdown-to-jsx": "^7.1.7",
"next": "12.1.6",
"p-memoize": "^7.1.1",
Expand Down
4 changes: 2 additions & 2 deletions public/locales/en/register.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"placeholder": {
"com.twitter": "e.g. ensdomains",
"com.github": "e.g. ensdomains",
"com.discord": "e.g. alisha.eth#0001",
"org.telegram": "e.g. futurealisha",
"com.discord": "e.g. nickjohnson",
"org.telegram": "e.g. nicksdjohnson",
"email": "e.g. hello@example.com"
}
},
Expand Down
8 changes: 4 additions & 4 deletions public/locales/en/transactionFlow.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"noOptions": "No account options available",
"placeholder": {
"default": "Add username here",
"com.twitter": "e.g. ensdomains",
"com.github": "e.g. ensdomains",
"com.discord": "e.g. alisha.eth#0001",
"org.telegram": "e.g. futurealisha",
"com.twitter": "e.g. nicksdjohnson",
"com.github": "e.g. arachnid",
"com.discord": "e.g. nickjohnson",
"org.telegram": "e.g. nicksdjohnson",
"email": "e.g. hello@example.com"
}
},
Expand Down
2 changes: 1 addition & 1 deletion public/locales/nl/transactionFlow.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"default": "Voeg username hier toe",
"com.twitter": "e.g. ensdomains",
"com.github": "e.g. ensdomains",
"com.discord": "e.g. alisha.eth#0001"
"com.discord": "e.g. nickjohnson"
}
},
"address": {
Expand Down
7 changes: 4 additions & 3 deletions public/locales/zh/register.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@
"com.discord": "Discord"
},
"placeholder": {
"com.twitter": "例如 ensdomains",
"com.github": "例如 ensdomains",
"com.discord": "例如 alisha.eth#0001"
"com.twitter": "例如 nicksdjohnson",
"com.github": "例如 arachnid",
"com.discord": "例如 nickjohnson",
"org.telegram": "e.g. nicksdjohnson"
}
},
"address": {
Expand Down
6 changes: 3 additions & 3 deletions public/locales/zh/transactionFlow.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"noOptions": "没有可用的账户",
"placeholder": {
"default": "在此添加用户名",
"com.twitter": "例如 ensdomains",
"com.github": "例如 ensdomains",
"com.discord": "例如 alisha.eth#0001"
"com.twitter": "例如 nicksdjohnson",
"com.github": "例如 arachnid",
"com.discord": "例如 nickjohnson"
}
},
"address": {
Expand Down
2 changes: 2 additions & 0 deletions src/assets/social/DynamicSocialIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const socialIconTypes = {
'com.twitter': dynamic(() => import('./SocialTwitter.svg')),
'com.youtube': dynamic(() => import('./SocialYoutube.svg')),
'org.telegram': dynamic(() => import('./SocialTelegram.svg')),
timezone: dynamic(() => import('@ensdomains/thorin').then((m) => m.MarkerSVG)),
email: dynamic(() => import('@ensdomains/thorin').then((m) => m.EnvelopeSVG)),
}

Expand All @@ -22,6 +23,7 @@ export const socialIconColors = {
'com.twitter': '#65C5FC',
'com.youtube': '#FF0000',
'org.telegram': '#2BABEE',
timezone: '#000000',
email: '#000000',
}

Expand Down
2 changes: 1 addition & 1 deletion src/constants/supportedSocialRecordKeys.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["com.twitter", "com.github", "com.discord", "org.telegram", "email"]
["com.twitter", "com.github", "com.discord", "org.telegram", "email", "timezone"]
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const mockProfileData = {
{
key: 'com.discord',
type: 'text',
value: 'test#1234',
value: 'test',
},
{
key: 'com.reddit',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const mockProfileData = {
{
key: 'com.discord',
type: 'text',
value: 'test#1234',
value: 'test',
},
{
key: 'com.reddit',
Expand Down
30 changes: 30 additions & 0 deletions src/utils/getSocialData.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { DateTime } from 'luxon'

export const getSocialData = (iconKey: string, value: string) => {
switch (iconKey) {
case 'twitter':
Expand Down Expand Up @@ -47,6 +49,34 @@ export const getSocialData = (iconKey: string, value: string) => {
value,
type: 'copy',
}
case 'timezone':
return {
icon: 'timezone',
color: '#2BABEE',
label: 'Timezone',
value: (() => {
try {
const zone = DateTime.now().setZone(value)
const now = DateTime.now().toLocal()

// Number of minutes between now and the target zone
const minutes = zone.offset - now.offset
const absoluteMinutes = Math.abs(minutes)

// To hour offset, 120 minutes = "+2:00", 90 minutes = "+1:30" including leading zeroes
const offset = `${minutes < 0 ? '-' : '+'}${Math.floor(absoluteMinutes / 60)
.toString()
.padStart(2, '0')}:${Math.abs(absoluteMinutes % 60)
.toString()
.padStart(2, '0')}`

return `${value} (${offset})`
} catch {
// If unable to parse offset simply return the user-set value
return value
}
})(),
}
default:
return null
}
Expand Down