Skip to content
This repository was archived by the owner on Mar 2, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/ui/views/Linked/LinkedNftDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import React, { useCallback, useEffect, useState } from 'react';
import { useLocation, useNavigate } from 'react-router';

import fallback from '@/ui/assets/image/errorImage.png';
import DetailMove from '@/ui/assets/svg/detailMove.svg';
import SendIcon from '@/ui/assets/svg/detailSend.svg';
import { useWallet } from '@/ui/hooks/use-wallet';
import { useProfiles } from '@/ui/hooks/useProfileHook';
Expand Down Expand Up @@ -481,7 +480,8 @@ const LinkedNftDetail = () => {
{chrome.i18n.getMessage('Send')}
</Button>
)}

{/* TODO: TB July 2025. This is not working as the script doesn't exist. Turning off for now */}
{/*
{nftDetail?.collectionID && (
<Button
sx={{
Expand All @@ -498,14 +498,14 @@ const LinkedNftDetail = () => {
disabled={!isAccessibleNft}
onClick={() => setMoveOpen(true)}
>
{/* <IosShareOutlinedIcon color="primary" /> */}
<CardMedia
image={DetailMove}
sx={{ width: '20px', height: '20px', color: '#fff', marginRight: '8px' }}
/>
{chrome.i18n.getMessage('Move')}
</Button>
)}
*/}
</Box>

{moveOpen && (
Expand Down
7 changes: 5 additions & 2 deletions src/ui/views/NFT/Detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,20 @@ const Detail = () => {
const [contactOne, setContactOne] = useState<any>(emptyContact);
const [contactTwo, setContactTwo] = useState<any>(emptyContact);
const [isAccessibleNft, setisAccessibleNft] = useState<any>(false);
const [canMoveChild, setCanMoveChild] = useState(true);

// TB July 2025. This always fails as the script doesn't exist. Turning off for now
const [canMoveChild, setCanMoveChild] = useState(false);
/*
useEffect(() => {
const checkPermission = async () => {
// TODO: TB July 2025. This always fails as the script doesn't exist. Turning off for now
const result = await usewallet.checkCanMoveChild(currentWallet.address);
setCanMoveChild(result);
};

checkPermission();
}, [usewallet, currentWallet.address]);

*/
useEffect(() => {
const savedState = localStorage.getItem('nftDetailState');
if (savedState) {
Expand Down
10 changes: 8 additions & 2 deletions src/ui/views/Welcome/Register/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box } from '@mui/material';
import * as bip39 from 'bip39';
import React, { useCallback, useEffect, useReducer } from 'react';
import { useNavigate } from 'react-router';
import { useLocation, useNavigate } from 'react-router';

import {
INITIAL_REGISTER_STATE,
Expand All @@ -28,6 +28,8 @@ export const initRegisterState = (initialState: RegisterState): RegisterState =>

const Register = () => {
const navigate = useNavigate();
const location = useLocation();

const usewallet = useWallet();

const [state, dispatch] = useReducer(registerReducer, INITIAL_REGISTER_STATE, initRegisterState);
Expand Down Expand Up @@ -66,11 +68,15 @@ const Register = () => {
}
};

// Only show the back button if there is a page to go back to
const showBackButton =
activeTab !== STEPS.ALL_SET && (activeTab !== STEPS.USERNAME || location.key !== 'default');

return (
<LandingComponents
activeIndex={Object.values(STEPS).indexOf(activeTab)}
direction="right"
showBackButton={activeTab !== STEPS.ALL_SET}
showBackButton={showBackButton}
onBack={goBack}
showConfetti={activeTab === STEPS.ALL_SET}
showRegisterHeader={true}
Expand Down
Loading