mirror of
https://github.com/pezkuwichain/pezkuwi-telegram-miniapp.git
synced 2026-04-21 23:37:55 +00:00
feat: add confirmCitizenship step to Rewards section
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pezkuwi-telegram-miniapp",
|
||||
"version": "1.0.207",
|
||||
"version": "1.0.209",
|
||||
"type": "module",
|
||||
"description": "Pezkuwichain Telegram Mini App - Forum, Announcements, Rewards",
|
||||
"author": "Pezkuwichain Team",
|
||||
|
||||
@@ -125,6 +125,15 @@ const ar: Translations = {
|
||||
stakingZeroWarning: 'إذا كان التخزين 0، فنقاط الثقة أيضًا 0. قم بالتخزين أولاً!',
|
||||
refreshScores: 'تحديث النقاط',
|
||||
points: 'نقاط',
|
||||
citizenshipStatus: 'حالة المواطنة',
|
||||
pendingApproval: 'بانتظار الموافقة',
|
||||
approved: 'تمت الموافقة',
|
||||
waitingReferrer: 'بانتظار موافقة المُحيل...',
|
||||
confirmCitizenship: 'تأكيد المواطنة',
|
||||
confirmingCitizenship: 'جاري تأكيد المواطنة...',
|
||||
signingBlockchain: 'جاري التوقيع على البلوكتشين',
|
||||
citizenshipConfirmed: 'مبروك! أنت الآن مواطن!',
|
||||
citizenshipFailed: 'فشل التأكيد',
|
||||
},
|
||||
|
||||
wallet: {
|
||||
|
||||
@@ -126,6 +126,15 @@ const ckb: Translations = {
|
||||
stakingZeroWarning: 'ئەگەر ستەیکینگ ٠ بێت، خاڵی متمانەش ٠ دەبێت. سەرەتا ستەیک بکە!',
|
||||
refreshScores: 'نوێکردنەوەی خاڵەکان',
|
||||
points: 'خاڵ',
|
||||
citizenshipStatus: 'بارودۆخی هاوڵاتیبوون',
|
||||
pendingApproval: 'چاوەڕوانی پەسەندکردن',
|
||||
approved: 'پەسەندکراو',
|
||||
waitingReferrer: 'چاوەڕوانی پەسەندکردنی ناساندنکەر...',
|
||||
confirmCitizenship: 'هاوڵاتیبوون پشتڕاست بکەرەوە',
|
||||
confirmingCitizenship: 'هاوڵاتیبوون پشتڕاست دەکرێتەوە...',
|
||||
signingBlockchain: 'لەسەر بلۆکچەین واژوو دەکرێت',
|
||||
citizenshipConfirmed: 'پیرۆزبێت! تۆ ئێستا هاوڵاتیت!',
|
||||
citizenshipFailed: 'پشتڕاستکردنەوە سەرنەکەوت',
|
||||
},
|
||||
|
||||
wallet: {
|
||||
|
||||
@@ -125,6 +125,15 @@ const en: Translations = {
|
||||
stakingZeroWarning: 'If Staking is 0, Trust score is also 0. Stake first!',
|
||||
refreshScores: 'Refresh Scores',
|
||||
points: 'points',
|
||||
citizenshipStatus: 'Citizenship Status',
|
||||
pendingApproval: 'Pending',
|
||||
approved: 'Approved',
|
||||
waitingReferrer: 'Waiting for referrer approval...',
|
||||
confirmCitizenship: 'Confirm Citizenship',
|
||||
confirmingCitizenship: 'Confirming citizenship...',
|
||||
signingBlockchain: 'Signing on blockchain',
|
||||
citizenshipConfirmed: 'Congratulations! You are now a citizen!',
|
||||
citizenshipFailed: 'Confirmation failed',
|
||||
},
|
||||
|
||||
wallet: {
|
||||
|
||||
@@ -125,6 +125,15 @@ const fa: Translations = {
|
||||
stakingZeroWarning: 'اگر سهامگذاری ۰ باشد، امتیاز اعتماد نیز ۰ است. ابتدا سهامگذاری کنید!',
|
||||
refreshScores: 'بازنشانی امتیازها',
|
||||
points: 'امتیاز',
|
||||
citizenshipStatus: 'وضعیت شهروندی',
|
||||
pendingApproval: 'در انتظار تایید',
|
||||
approved: 'تایید شده',
|
||||
waitingReferrer: 'در انتظار تایید معرف...',
|
||||
confirmCitizenship: 'تایید شهروندی',
|
||||
confirmingCitizenship: 'در حال تایید شهروندی...',
|
||||
signingBlockchain: 'در حال امضا روی بلاکچین',
|
||||
citizenshipConfirmed: 'تبریک! شما اکنون شهروند هستید!',
|
||||
citizenshipFailed: 'تایید ناموفق بود',
|
||||
},
|
||||
|
||||
wallet: {
|
||||
|
||||
@@ -130,6 +130,15 @@ const krd: Translations = {
|
||||
'Staking 0 be, Trust p\u00fban j\u00ee 0 dibe. Ber\u00ee her ti\u015ft\u00ee stake bike!',
|
||||
refreshScores: 'P\u00fbanan N\u00fbve Bike',
|
||||
points: 'p\u00fban',
|
||||
citizenshipStatus: 'Rew\u015fa Welat\u00eeb\u00fbn\u00ea',
|
||||
pendingApproval: 'Li benda pejrandin\u00ea',
|
||||
approved: 'Pejrand\u00ee',
|
||||
waitingReferrer: 'Li benda pejirandina referrer...',
|
||||
confirmCitizenship: 'Welat\u00eeb\u00fbn\u00ea Pi\u015ftrast Bike',
|
||||
confirmingCitizenship: 'Welat\u00eeb\u00fbn t\u00ea pi\u015ftrastkirin...',
|
||||
signingBlockchain: 'Li blockchain t\u00ea \u00eemzekirin',
|
||||
citizenshipConfirmed: 'P\u00eeroz be! Tu b\u00fby\u00ee welat\u00ee!',
|
||||
citizenshipFailed: 'Pi\u015ftrastkirin biserneket',
|
||||
},
|
||||
|
||||
wallet: {
|
||||
|
||||
@@ -125,6 +125,15 @@ const tr: Translations = {
|
||||
stakingZeroWarning: 'Staking 0 ise Güven puanı da 0 olur. Önce stake yapın!',
|
||||
refreshScores: 'Puanları Yenile',
|
||||
points: 'puan',
|
||||
citizenshipStatus: 'Vatanda\u015fl\u0131k Durumu',
|
||||
pendingApproval: 'Onay Bekliyor',
|
||||
approved: 'Onaylandı',
|
||||
waitingReferrer: 'Referrer onay\u0131 bekleniyor...',
|
||||
confirmCitizenship: 'Vatanda\u015fl\u0131\u011f\u0131 Onayla',
|
||||
confirmingCitizenship: 'Vatanda\u015fl\u0131k onaylan\u0131yor...',
|
||||
signingBlockchain: "Blockchain'de imzalan\u0131yor",
|
||||
citizenshipConfirmed: 'Tebrikler! Art\u0131k vatanda\u015fs\u0131n\u0131z!',
|
||||
citizenshipFailed: 'Onay ba\u015far\u0131s\u0131z oldu',
|
||||
},
|
||||
|
||||
wallet: {
|
||||
|
||||
@@ -127,6 +127,15 @@ export interface Translations {
|
||||
stakingZeroWarning: string;
|
||||
refreshScores: string;
|
||||
points: string;
|
||||
citizenshipStatus: string;
|
||||
pendingApproval: string;
|
||||
approved: string;
|
||||
waitingReferrer: string;
|
||||
confirmCitizenship: string;
|
||||
confirmingCitizenship: string;
|
||||
signingBlockchain: string;
|
||||
citizenshipConfirmed: string;
|
||||
citizenshipFailed: string;
|
||||
};
|
||||
|
||||
// Wallet section
|
||||
|
||||
@@ -183,3 +183,63 @@ export async function applyCitizenship(
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// ── Confirm Citizenship ─────────────────────────────────────────────
|
||||
|
||||
export async function confirmCitizenship(
|
||||
api: ApiPromise,
|
||||
keypair: KeyringPair
|
||||
): Promise<CitizenshipResult> {
|
||||
try {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const tx = api.tx as any;
|
||||
if (!tx?.identityKyc?.confirmCitizenship) {
|
||||
return { success: false, error: 'Identity KYC pallet not available' };
|
||||
}
|
||||
|
||||
const result = await new Promise<CitizenshipResult>((resolve) => {
|
||||
tx.identityKyc
|
||||
.confirmCitizenship()
|
||||
.signAndSend(
|
||||
keypair,
|
||||
{ nonce: -1 },
|
||||
({
|
||||
status,
|
||||
dispatchError,
|
||||
}: {
|
||||
status: {
|
||||
isInBlock: boolean;
|
||||
isFinalized: boolean;
|
||||
asInBlock?: { toString: () => string };
|
||||
asFinalized?: { toString: () => string };
|
||||
};
|
||||
dispatchError?: { isModule: boolean; asModule: unknown; toString: () => string };
|
||||
}) => {
|
||||
if (status.isInBlock || status.isFinalized) {
|
||||
if (dispatchError) {
|
||||
let errorMessage = 'Citizenship confirmation failed';
|
||||
if (dispatchError.isModule) {
|
||||
const decoded = api.registry.findMetaError(
|
||||
dispatchError.asModule as Parameters<typeof api.registry.findMetaError>[0]
|
||||
);
|
||||
errorMessage = `${decoded.section}.${decoded.name}`;
|
||||
}
|
||||
resolve({ success: false, error: errorMessage });
|
||||
return;
|
||||
}
|
||||
const blockHash = status.asFinalized?.toString() || status.asInBlock?.toString();
|
||||
resolve({ success: true, blockHash });
|
||||
}
|
||||
}
|
||||
)
|
||||
.catch((error: Error) => resolve({ success: false, error: error.message }));
|
||||
});
|
||||
|
||||
return result;
|
||||
} catch (error) {
|
||||
return {
|
||||
success: false,
|
||||
error: error instanceof Error ? error.message : 'Unknown error',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
+109
-1
@@ -44,6 +44,12 @@ import {
|
||||
formatRewardDate,
|
||||
type StakingRewardsResult,
|
||||
} from '@/lib/subquery';
|
||||
import {
|
||||
getCitizenshipStatus,
|
||||
confirmCitizenship,
|
||||
type CitizenshipStatus,
|
||||
} from '@/lib/citizenship';
|
||||
import { KurdistanSun } from '@/components/KurdistanSun';
|
||||
|
||||
// Activity tracking constants
|
||||
const ACTIVITY_STORAGE_KEY = 'pezkuwi_last_active';
|
||||
@@ -53,7 +59,7 @@ export function RewardsSection() {
|
||||
const { hapticImpact, hapticNotification, shareUrl, showAlert } = useTelegram();
|
||||
const { user: authUser } = useAuth();
|
||||
const { stats, myReferrals, loading, refreshStats } = useReferral();
|
||||
const { isConnected, address, peopleApi } = useWallet();
|
||||
const { isConnected, address, peopleApi, keypair } = useWallet();
|
||||
const { t } = useTranslation();
|
||||
|
||||
const [copied, setCopied] = useState(false);
|
||||
@@ -64,6 +70,8 @@ export function RewardsSection() {
|
||||
const [stakingStatus, setStakingStatus] = useState<StakingScoreStatus | null>(null);
|
||||
const [stakingRewards, setStakingRewards] = useState<StakingRewardsResult | null>(null);
|
||||
const [scoresLoading, setScoresLoading] = useState(false);
|
||||
const [citizenshipStatus, setCitizenshipStatus] = useState<CitizenshipStatus>('NotStarted');
|
||||
const [showConfirmAnimation, setShowConfirmAnimation] = useState(false);
|
||||
|
||||
// Check activity status
|
||||
const checkActivityStatus = useCallback(() => {
|
||||
@@ -132,6 +140,34 @@ export function RewardsSection() {
|
||||
}
|
||||
}, [activeTab, address, fetchUserScores]);
|
||||
|
||||
// Fetch citizenship status
|
||||
useEffect(() => {
|
||||
if (!peopleApi || !address) return;
|
||||
getCitizenshipStatus(peopleApi, address).then(setCitizenshipStatus);
|
||||
}, [peopleApi, address]);
|
||||
|
||||
const handleConfirmCitizenship = async () => {
|
||||
if (!peopleApi || !keypair) return;
|
||||
setShowConfirmAnimation(true);
|
||||
hapticImpact('medium');
|
||||
try {
|
||||
const result = await confirmCitizenship(peopleApi, keypair);
|
||||
if (result.success) {
|
||||
hapticNotification('success');
|
||||
setCitizenshipStatus('Approved');
|
||||
showAlert(t('rewards.citizenshipConfirmed'));
|
||||
} else {
|
||||
hapticNotification('error');
|
||||
showAlert(result.error || t('rewards.citizenshipFailed'));
|
||||
}
|
||||
} catch (err) {
|
||||
hapticNotification('error');
|
||||
showAlert(err instanceof Error ? err.message : t('rewards.citizenshipFailed'));
|
||||
} finally {
|
||||
setShowConfirmAnimation(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleActivate = () => {
|
||||
hapticNotification('success');
|
||||
localStorage.setItem(ACTIVITY_STORAGE_KEY, Date.now().toString());
|
||||
@@ -332,6 +368,69 @@ export function RewardsSection() {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Citizenship Status Card */}
|
||||
{(citizenshipStatus === 'PendingReferral' ||
|
||||
citizenshipStatus === 'ReferrerApproved') && (
|
||||
<div className="bg-secondary/30 rounded-xl p-4 border border-border/50">
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<Shield className="w-5 h-5 text-emerald-400" />
|
||||
<h3 className="font-medium text-foreground">
|
||||
{t('rewards.citizenshipStatus')}
|
||||
</h3>
|
||||
</div>
|
||||
<div className="flex items-center gap-3 mb-3">
|
||||
<div
|
||||
className={cn(
|
||||
'flex items-center gap-1.5 px-3 py-1.5 rounded-full text-xs font-medium',
|
||||
citizenshipStatus === 'PendingReferral'
|
||||
? 'bg-green-500/20 text-green-400'
|
||||
: 'bg-secondary text-muted-foreground'
|
||||
)}
|
||||
>
|
||||
<div
|
||||
className={cn(
|
||||
'w-2 h-2 rounded-full',
|
||||
citizenshipStatus === 'PendingReferral'
|
||||
? 'bg-green-400'
|
||||
: 'bg-muted-foreground'
|
||||
)}
|
||||
/>
|
||||
{t('rewards.pendingApproval')}
|
||||
</div>
|
||||
<div
|
||||
className={cn(
|
||||
'flex items-center gap-1.5 px-3 py-1.5 rounded-full text-xs font-medium',
|
||||
citizenshipStatus === 'ReferrerApproved'
|
||||
? 'bg-green-500/20 text-green-400'
|
||||
: 'bg-secondary text-muted-foreground'
|
||||
)}
|
||||
>
|
||||
{citizenshipStatus === 'ReferrerApproved' ? (
|
||||
<Check className="w-3 h-3" />
|
||||
) : (
|
||||
<div className="w-2 h-2 rounded-full bg-muted-foreground" />
|
||||
)}
|
||||
{t('rewards.approved')}
|
||||
</div>
|
||||
</div>
|
||||
{citizenshipStatus === 'PendingReferral' && (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t('rewards.waitingReferrer')}
|
||||
</p>
|
||||
)}
|
||||
{citizenshipStatus === 'ReferrerApproved' && (
|
||||
<button
|
||||
onClick={handleConfirmCitizenship}
|
||||
disabled={!keypair}
|
||||
className="w-full py-3 rounded-lg font-medium flex items-center justify-center gap-2 bg-gradient-to-r from-green-500 to-emerald-600 text-white hover:opacity-90 transition-all"
|
||||
>
|
||||
<Check className="w-5 h-5" />
|
||||
{t('rewards.confirmCitizenship')}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Invite Card */}
|
||||
<div className="bg-secondary/30 rounded-xl p-4 border border-border/50">
|
||||
<h3 className="font-medium text-foreground mb-3 flex items-center gap-2">
|
||||
@@ -748,6 +847,15 @@ export function RewardsSection() {
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Confirm Citizenship Overlay */}
|
||||
{showConfirmAnimation && (
|
||||
<div className="fixed inset-0 z-50 bg-black/90 flex flex-col items-center justify-center">
|
||||
<KurdistanSun size={120} />
|
||||
<p className="text-white mt-6 text-lg">{t('rewards.confirmingCitizenship')}</p>
|
||||
<p className="text-white/60 text-sm mt-2">{t('rewards.signingBlockchain')}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.0.207",
|
||||
"buildTime": "2026-02-16T23:33:56.480Z",
|
||||
"buildNumber": 1771284836480
|
||||
"version": "1.0.209",
|
||||
"buildTime": "2026-02-19T22:20:57.906Z",
|
||||
"buildNumber": 1771539657907
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user