Skip to content

Commit fd7d1b7

Browse files
authored
Merge branch 'main' into feat/sentry
2 parents d241842 + 80a74e3 commit fd7d1b7

File tree

3 files changed

+48
-35
lines changed

3 files changed

+48
-35
lines changed

CHANGELOG.md

+20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Changelog
22

3+
## [1.16.2](https://github.com/storacha/console/compare/w3console-v1.16.1...w3console-v1.16.2) (2024-12-13)
4+
5+
6+
### Bug Fixes
7+
8+
* remove referrals feature flag ([#161](https://github.com/storacha/console/issues/161)) ([d504602](https://github.com/storacha/console/commit/d50460297983d6fb097721244963fd77aaf68fd1))
9+
10+
## [1.16.1](https://github.com/storacha/console/compare/w3console-v1.16.0...w3console-v1.16.1) (2024-12-12)
11+
12+
13+
### Bug Fixes
14+
15+
* make it possible to skip the plan gate after Stripe checkout ([#162](https://github.com/storacha/console/issues/162)) ([b399b37](https://github.com/storacha/console/commit/b399b372ddbcf850135263a7c7b31b88a4b42256))
16+
* tweak plan gate query param ([#163](https://github.com/storacha/console/issues/163)) ([0ce071e](https://github.com/storacha/console/commit/0ce071e9805d7b99bd98bb65262b2fe1b2e6e1b6))
17+
18+
19+
### Other Changes
20+
21+
* update copy ([#159](https://github.com/storacha/console/issues/159)) ([0253b05](https://github.com/storacha/console/commit/0253b059d6e70f0ef5b83f82e722fc35b66f35d0))
22+
323
## [1.16.0](https://github.com/storacha/console/compare/w3console-v1.15.2...w3console-v1.16.0) (2024-12-09)
424

525

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "w3console",
3-
"version": "1.16.0",
3+
"version": "1.16.2",
44
"private": true,
55
"packageManager": "[email protected]+sha256.7a4261e50d9a44d9240baf6c9d6e10089dcf0a79d0007f2a26985a6927324177",
66
"scripts": {

src/app/settings/page.tsx

+27-34
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { GB, TB, filesize } from '@/lib'
1010
import DefaultLoader from '@/components/Loader'
1111
import { RefcodeLink, ReferralsList, RefcodeCreator } from '../referrals/page'
1212
import { useReferrals } from '@/lib/referrals/hooks'
13-
import { useSearchParams } from 'next/navigation'
1413

1514
const Plans: Record<`did:${string}`, { name: string, limit: number }> = {
1615
'did:web:starter.web3.storage': { name: 'Starter', limit: 5 * GB },
@@ -75,43 +74,37 @@ export default function SettingsPage (): JSX.Element {
7574
// TODO: need to calculate these from the referral information that gets added during the TBD cronjob
7675
const credits = 0
7776
const points = 0
78-
const params = useSearchParams()
79-
const referralsEnabled = (params.get('referrals') === 'enabled')
8077
return (
8178
<>
8279
<SettingsNav />
8380
<H1>Settings</H1>
84-
{referralsEnabled && (
85-
<>
86-
<H2>Rewards</H2>
87-
<div className='flex flex-row space-x-2 justify-between max-w-4xl mb-4'>
88-
<div className='border border-hot-red rounded-2xl bg-white p-5 flex-grow'>
89-
<H3>Referred</H3>
90-
<span className='text-4xl'>{referred}</span> / {MAX_REFERRALS}
91-
</div>
92-
<div className='border border-hot-red rounded-2xl bg-white p-5 flex-grow'>
93-
<H3>USD Credits</H3>
94-
<span className='text-4xl'>{credits}</span> / {MAX_CREDITS}
95-
</div>
96-
<div className='border border-hot-red rounded-2xl bg-white p-5 flex-grow'>
97-
<H3>Racha Points</H3>
98-
<span className='text-4xl'>{points}</span>
99-
</div>
100-
</div>
101-
<div className='border border-hot-red rounded-2xl bg-white p-5 max-w-4xl mb-4'>
102-
<ReferralsList />
103-
{referralLink ? (
104-
<RefcodeLink referralLink={referralLink} />
105-
) : (
106-
<RefcodeCreator
107-
accountEmail={accountEmail}
108-
urlQueryEmail={urlQueryEmail}
109-
createRefcode={createRefcode}
110-
mutateRefcode={mutateRefcode}
111-
setReferrerEmail={setReferrerEmail} />)}
112-
</div>
113-
</>
114-
)}
81+
<H2>Rewards</H2>
82+
<div className='flex flex-row space-x-2 justify-between max-w-4xl mb-4'>
83+
<div className='border border-hot-red rounded-2xl bg-white p-5 flex-grow'>
84+
<H3>Referred</H3>
85+
<span className='text-4xl'>{referred}</span> / {MAX_REFERRALS}
86+
</div>
87+
<div className='border border-hot-red rounded-2xl bg-white p-5 flex-grow'>
88+
<H3>USD Credits</H3>
89+
<span className='text-4xl'>{credits}</span> / {MAX_CREDITS}
90+
</div>
91+
<div className='border border-hot-red rounded-2xl bg-white p-5 flex-grow'>
92+
<H3>Racha Points</H3>
93+
<span className='text-4xl'>{points}</span>
94+
</div>
95+
</div>
96+
<div className='border border-hot-red rounded-2xl bg-white p-5 max-w-4xl mb-4'>
97+
<ReferralsList />
98+
{referralLink ? (
99+
<RefcodeLink referralLink={referralLink} />
100+
) : (
101+
<RefcodeCreator
102+
accountEmail={accountEmail}
103+
urlQueryEmail={urlQueryEmail}
104+
createRefcode={createRefcode}
105+
mutateRefcode={mutateRefcode}
106+
setReferrerEmail={setReferrerEmail} />)}
107+
</div>
115108
<div className='border border-hot-red rounded-2xl bg-white p-5 max-w-4xl'>
116109
<H2>Plan</H2>
117110
<p className='font-epilogue mb-4'>

0 commit comments

Comments
 (0)