diff --git a/public/assets/images/popup/reload.svg b/public/assets/images/popup/reload.svg new file mode 100644 index 00000000..1f1062dd --- /dev/null +++ b/public/assets/images/popup/reload.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/extension/components/shell-popup.tsx b/src/extension/components/shell-popup.tsx index bca3f379..25d0566b 100644 --- a/src/extension/components/shell-popup.tsx +++ b/src/extension/components/shell-popup.tsx @@ -60,30 +60,32 @@ const ShellPopUp: React.FC = ({ const [updating, setUpdating] = useState(false); - const goToHomeOrUpdate = async () => { - if (history.location.pathname !== DEFAULT_ROUTE) { - await sendFlowRepository.reset(); - history.push(DEFAULT_ROUTE); - } else { - if (updating) return; - setUpdating(true); - try { - const updater = new UpdaterService( - walletRepository, - appRepository, - blockHeadersRepository, - assetRepository, - await zkp() - ); - if (!cache?.network) throw new Error('Network not found'); - await updater.checkAndFixMissingTransactionsData(cache.network); - } catch (e) { - console.error(e); - } finally { - setUpdating(false); - } + const goToHome = async () => { + if (history.location.pathname === DEFAULT_ROUTE) return; + await sendFlowRepository.reset(); + history.push(DEFAULT_ROUTE); + }; + + const update = async () => { + if (updating) return; + setUpdating(true); + try { + const updater = new UpdaterService( + walletRepository, + appRepository, + blockHeadersRepository, + assetRepository, + await zkp() + ); + if (!cache?.network) throw new Error('Network not found'); + await updater.checkAndFixMissingTransactionsData(cache.network); + } catch (e) { + console.error(e); + } finally { + setUpdating(false); } }; + const handleBackBtn = () => { if (backBtnCb) { backBtnCb(); @@ -141,12 +143,8 @@ const ShellPopUp: React.FC = ({ - - + + {cache?.network !== 'liquid' && ( @@ -160,9 +158,18 @@ const ShellPopUp: React.FC = ({ )} {(isUpdaterLoading || isRestorerLoading) && loader()} - - - + + + + + + + + {nav}