Skip to content

Commit

Permalink
Fix variable names and remove unnecessary type
Browse files Browse the repository at this point in the history
  • Loading branch information
Imamah-Zafar committed Jun 27, 2023
1 parent 962f9e8 commit a309c67
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 24 deletions.
16 changes: 8 additions & 8 deletions src/app/screens/home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ function Home() {
const [openReceiveModal, setOpenReceiveModal] = useState(false);
const [openSendModal, setOpenSendModal] = useState(false);
const [openBuyModal, setOpenBuyModal] = useState(false);
const [btcReceiveAlert, setBtcReceiveAlert] = useState<boolean>(false);
const [ordinalReceiveAlert, setOrdinalReceiveAlert] = useState<boolean>(false);
const [isBtcReceiveAlertVisible, setIsBtcReceiveAlertVisible] = useState(false);
const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
const { coinsList, stxAddress, btcAddress, ordinalsAddress, brcCoinsList, showBtcReceiveAlert, showOrdinalReceiveAlert } = useWalletSelector();
const { isLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
useStxWalletData();
Expand Down Expand Up @@ -223,20 +223,20 @@ function Home() {

const onOrdinalReceiveAlertOpen = () => {
if (showOrdinalReceiveAlert)
setOrdinalReceiveAlert(true);
setIsOrdinalReceiveAlertVisible(true);
};

const onOrdinalReceiveAlertClose = () => {
setOrdinalReceiveAlert(false);
setIsOrdinalReceiveAlertVisible(false);
};

const onReceiveAlertClose = () => {
setBtcReceiveAlert(false);
setIsBtcReceiveAlertVisible(false);
};

const onReceiveAlertOpen = () => {
if (showBtcReceiveAlert)
setBtcReceiveAlert(true);
setIsBtcReceiveAlertVisible(true);
};

const handleTokenPressed = (token: {
Expand Down Expand Up @@ -287,8 +287,8 @@ function Home() {
return (
<>
<AccountHeaderComponent />
{btcReceiveAlert && <ShowBtcReceiveAlert onReceiveAlertClose={onReceiveAlertClose}/>}
{ordinalReceiveAlert && <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose}/>}
{isBtcReceiveAlertVisible && <ShowBtcReceiveAlert onReceiveAlertClose={onReceiveAlertClose}/>}
{isOrdinalReceiveAlertVisible && <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose}/>}
<Container>
<BalanceCard
isLoading={
Expand Down
12 changes: 6 additions & 6 deletions src/app/screens/nftDashboard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ const BarLoaderContainer = styled.div((props) => ({
function NftDashboard() {
const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' });
const dispatch = useDispatch();
const { stxAddress, ordinalsAddress, hasActivatedOrdinalsKey, showOrdinalReceiveAlert } = useWalletSelector();
const [showShareNftOptions, setShowNftOptions] = useState<boolean>(false);
const { stxAddress, ordinalsAddress, hasActivatedOrdinalsKey } = useWalletSelector();
const [showShareNftOptions, setShowNftOptions] = useState(false);
const [openReceiveModal, setOpenReceiveModal] = useState(false);
const [showActivateOrdinalsAlert, setShowActivateOrdinalsAlert] = useState(false);
const [ordinalReceiveAlert, setOrdinalReceiveAlert] = useState<boolean>(false);
const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
const {
data: nftsList,
hasNextPage,
Expand Down Expand Up @@ -274,11 +274,11 @@ function NftDashboard() {
);

const onOrdinalReceiveAlertOpen = () => {
setOrdinalReceiveAlert(true);
setIsOrdinalReceiveAlertVisible(true);
};

const onOrdinalReceiveAlertClose = () => {
setOrdinalReceiveAlert(false);
setIsOrdinalReceiveAlertVisible(false);
};

const NftListView = useCallback(
Expand Down Expand Up @@ -330,7 +330,7 @@ function NftDashboard() {

return (
<>
{ordinalReceiveAlert && <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose} />}
{isOrdinalReceiveAlertVisible && <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose} />}
{showActivateOrdinalsAlert && (
<AlertMessage
title={t('ACTIVATE_ORDINALS')}
Expand Down
18 changes: 8 additions & 10 deletions src/app/screens/receive/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import ActionButton from '@components/button';
import useWalletSelector from '@hooks/useWalletSelector';
import BottomTabBar from '@components/tabBar';
import InfoContainer from '@components/infoContainer';
import { useDispatch } from 'react-redux';
import ShowBtcReceiveAlert from '@components/showBtcReceiveAlert';
import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';

Expand Down Expand Up @@ -96,10 +95,9 @@ const InfoAlertContainer = styled.div({
function Receive(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'RECEIVE' });
const [addressCopied, setAddressCopied] = useState(false);
const [btcReceiveAlert, setBtcReceiveAlert] = useState<boolean>(false);
const [ordinalReceiveAlert, setOrdinalReceiveAlert] = useState<boolean>(false);
const [isBtcReceiveAlertVisible, setIsBtcReceiveAlertVisible] = useState(false);
const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
const navigate = useNavigate();
const dispatch = useDispatch();
const {
stxAddress,
btcAddress,
Expand Down Expand Up @@ -148,18 +146,18 @@ function Receive(): JSX.Element {
};

const onReceiveAlertClose = () => {
setBtcReceiveAlert(false);
setIsBtcReceiveAlertVisible(false);
};

const onOrdinalReceiveAlertClose = () => {
setOrdinalReceiveAlert(false);
setIsOrdinalReceiveAlertVisible(false);
};

const handleOnClick = () => {
navigator.clipboard.writeText(getAddress());
setAddressCopied(true);
if (currency === 'BTC' && showBtcReceiveAlert) { setBtcReceiveAlert(true); }
if (currency === 'ORD' && showOrdinalReceiveAlert ) { setOrdinalReceiveAlert(true); }
if (currency === 'BTC' && showBtcReceiveAlert) { setIsBtcReceiveAlertVisible(true); }
if (currency === 'ORD' && showOrdinalReceiveAlert ) { setIsOrdinalReceiveAlertVisible(true); }
};
return (
<>
Expand Down Expand Up @@ -208,8 +206,8 @@ function Receive(): JSX.Element {
<BottomBarContainer>
<BottomTabBar tab="dashboard" />
</BottomBarContainer>
{btcReceiveAlert && <ShowBtcReceiveAlert onReceiveAlertClose={onReceiveAlertClose}/>}
{ordinalReceiveAlert && <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose}/>}
{isBtcReceiveAlertVisible && <ShowBtcReceiveAlert onReceiveAlertClose={onReceiveAlertClose}/>}
{isOrdinalReceiveAlertVisible && <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose}/>}

</>
);
Expand Down

0 comments on commit a309c67

Please sign in to comment.