Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.0.17 #559

Merged
merged 35 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f4996ed
feat(HardWallet): new layout
GabrielPrediger Feb 23, 2024
18b7078
fix(i18): es translation
GabrielPrediger Feb 23, 2024
4ab932a
feat(CustomRpc): new layout
GabrielPrediger Feb 23, 2024
0dbf0d3
fix(ChangeChain): error when try to connected at
GabrielPrediger Feb 26, 2024
900198a
fix(EvmList): tx options modal rerender
GabrielPrediger Feb 28, 2024
3136b07
style(SendTransaction):adjusted send icon position
GabrielPrediger Feb 28, 2024
85d3fb1
fix(NetworkList): code improvment
GabrielPrediger Feb 29, 2024
8a8be97
fix(EvmList): code improvment
GabrielPrediger Feb 29, 2024
8a47524
fix(EvmList): code improvment
GabrielPrediger Feb 29, 2024
8c27554
fix(EvmList): code improvment
GabrielPrediger Feb 29, 2024
7d9d164
fix(CncHardwareWallet): code improvment
GabrielPrediger Feb 29, 2024
64e7971
fix(CustomRPC): code improvment
GabrielPrediger Feb 29, 2024
71b0709
fix(ActivityPanel): hasTransaction crash error
GabrielPrediger Mar 1, 2024
e644133
chore: udpdate mainnet rpc url
lucasgabrielgsp Mar 2, 2024
79abacd
fix: change hasTransactions value
lucasgabrielgsp Mar 5, 2024
fe41fb4
Merge pull request #558 from syscoin/chore/update-mainnet-rpc
lucasgabrielgsp Mar 5, 2024
7d32f39
chore: update pali version
lucasgabrielgsp Mar 5, 2024
f945395
chore: merge changes from develop
lucasgabrielgsp Mar 5, 2024
d341ce6
Merge pull request #556 from syscoin/fix/transactions-options-modal
lucasgabrielgsp Mar 5, 2024
3aefa2d
chore: merge changes from develop
lucasgabrielgsp Mar 5, 2024
cf5ecd4
Merge pull request #557 from syscoin/style/tx-page-send-icon
lucasgabrielgsp Mar 5, 2024
fddcd76
chore: merge changes from develop
lucasgabrielgsp Mar 5, 2024
0081f47
Merge pull request #555 from syscoin/fix/chain-error
lucasgabrielgsp Mar 5, 2024
db50ee4
Merge pull request #554 from syscoin/feat/custom-rpc
lucasgabrielgsp Mar 5, 2024
65fa449
chore: merge changes from develop
lucasgabrielgsp Mar 5, 2024
c3f7ddd
Merge pull request #553 from syscoin/feat/connect-trezor-redesign
lucasgabrielgsp Mar 5, 2024
9576efd
chore: update syscoin UTXO rpc url
lucasgabrielgsp Mar 5, 2024
8e2fa03
fix(Details): fix open explorer url
GabrielPrediger Mar 6, 2024
d9626d6
chore: remove manifest.json from changed files
lucasgabrielgsp Mar 6, 2024
199f4f8
Merge pull request #561 from syscoin/fix/open-explorer-tx
lucasgabrielgsp Mar 6, 2024
23f4708
chore: merge changes from develop
lucasgabrielgsp Mar 7, 2024
0c50025
Merge pull request #562 from syscoin/hotfix/2.0.16
lucasgabrielgsp Mar 7, 2024
a17f348
fix: solve state migration issue
lucasgabrielgsp Mar 14, 2024
eee271e
chore: update pali version
lucasgabrielgsp Mar 19, 2024
d55501b
Merge pull request #565 from syscoin/hotfix/state-migration
lucasgabrielgsp Mar 19, 2024
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
4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Pali Wallet",
"version": "2.0.15",
"version": "2.0.17",
"icons": {
"16": "assets/icons/favicon-16.png",
"32": "assets/icons/favicon-32.png",
Expand Down Expand Up @@ -91,4 +91,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paliwallet",
"version": "2.0.15",
"version": "2.0.17",
"description": "A Non-Custodial Crypto Wallet",
"private": true,
"repository": {
Expand Down Expand Up @@ -48,7 +48,7 @@
"@babel/runtime": "^7.21.5",
"@headlessui/react": "^1.6.0",
"@heroicons/react": "^1.0.5",
"@pollum-io/sysweb3-keyring": "^1.0.478",
"@pollum-io/sysweb3-keyring": "^1.0.479",
"@pollum-io/sysweb3-network": "^1.0.95",
"@pollum-io/sysweb3-utils": "^1.1.232",
"@reduxjs/toolkit": "^1.4.0",
Expand Down
5 changes: 0 additions & 5 deletions palette.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ module.exports = {
whiteAlpha300: 'rgba(255, 255, 255, 0.16)',
},

alpha: {
whiteAlpha300: 'rgba(255, 255, 255, 0.16)',
whiteAlpha200: 'rgba(255, 255, 255, 0.08)',
},

extraColors: {
red: '#D70000',
},
Expand Down
3 changes: 3 additions & 0 deletions source/assets/icons/hardwallet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 6 additions & 3 deletions source/assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@
"titles": {
"assetDetails": "ASSET DETAILS",
"transactionDetails": "TRANSACTION DETAILS",
"importWallet": "Import wallet"
"importWallet": "Import wallet",
"congratulations": "CONGRATULATIONS!"
},
"import": {
"importingYourAccount": "Importing your wallet seed automatically import a wallet associated with this seed phrase.",
Expand Down Expand Up @@ -313,12 +314,14 @@
"permissions": "Permissions",
"viewTheAddresses": "View the addresses of your permitted accounts",
"errorCreatingHardWallet": "Error creating hardware wallet.",
"hardwareWallet": "HARDWARE WALLET",
"selectTheHardware": "Select the hardware wallet you'd like",
"hardwareWallet": "CONNECT HARDWALLET",
"selectTheHardware": "SELECT HARDWALLET:",
"toConnect": "to connect",
"toAddAccount": "to add account",
"toPali": "to Pali",
"dontHaveWallet": "Don't have a hardware wallet?",
"connectYourWalletAndClick": "CONNECT YOUR {{hardwalletName}} AND CLICK TO CONNECT!",
"youCanUseAny": "You can use any {{hardwalletName}} device.",
"orderTrezor": "Order a Trezor wallet and keep your funds in cold storage.",
"orderLedger": "Order a Ledger wallet and keep your funds in cold storage.",
"buyNow": "Buy now",
Expand Down
9 changes: 6 additions & 3 deletions source/assets/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@
"titles": {
"assetDetails": "DETALLES DEL ACTIVO",
"transactionDetails": "DETALLES DE LA TRANSACCIÓN",
"importWallet": "Importar billetera"
"importWallet": "Importar billetera",
"congratulations": "FELICIDADES!"
},
"import": {
"importingYourAccount": "Importar tu frase semilla de billetera automáticamente importará una billetera asociada a esta frase semilla.",
Expand Down Expand Up @@ -315,12 +316,14 @@
"addNewChain": "Agregar Nueva Cadena",
"viewTheAddresses": "Ver las direcciones de tus cuentas permitidas",
"errorCreatingHardWallet": "Error al crear monedero hardware.",
"hardwareWallet": "MONEDERO HARDWARE",
"selectTheHardware": "Selecciona el monedero hardware que desees",
"hardwareWallet": "CONECTAR HARDWALLET",
"selectTheHardware": "SELECCIONAR HARDWALLET:",
"toConnect": "conectar",
"toAddAccount": "para agregar una cuenta",
"toPali": "a Pali",
"dontHaveWallet": "¿No tienes un monedero hardware?",
"connectYourWalletAndClick": "CONECTA TU MONEDERO {{hardwalletName}} Y HAZ CLIC PARA CONECTAR",
"youCanUseAny": "Puedes usar cualquier dispositivo {{hardwalletName}}.",
"orderTrezor": "Ordena un monedero Trezor y guarda tus fondos en almacenamiento en frío.",
"orderLedger": "Ordena un monedero Ledger y guarda tus fondos en almacenamiento en frío.",
"buyNow": "Comprar ahora",
Expand Down
10 changes: 9 additions & 1 deletion source/assets/locales/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,9 @@
"allYourSettings": "All your settings, like custom tokens and imported accounts, will get lost, however, your funds it’s saved!",
"setAutoLockTime": "Configurar tempo de bloqueio automático",
"defaultMinutes": "Padrão: 5 minutos após inatividade.",
"maximumMinutes": "Máximo: 120 minutos."
"maximumMinutes": "Máximo: 120 minutos.",
"connectYourWalletAndClick": "CONECTE SUA {{hardwalletName}} E CLIQUE PARA CONECTAR!",
"youCanUseAny": "Você pode usar qualquer dispositivo {{hardwalletName}}."
},
"start": {
"getStarted": "Get started",
Expand Down Expand Up @@ -379,5 +381,11 @@
"walletSeedPhrasePage": {
"keepSeedPhrase": "Mantenha sua seed em segredo!",
"anyoneWithThisInfo": "Qualquer pessoa com estas informações pode roubar seus fundos."
},
"titles": {
"assetDetails": "DETALLES DEL ACTIVO",
"transactionDetails": "DETALLES DE LA TRANSACCIÓN",
"importWallet": "Importar billetera",
"congratulations": "PARABÉNS!"
}
}
17 changes: 13 additions & 4 deletions source/assets/styles/custom-input-normal.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
font-weight: 400;
line-height: normal;
color: #fff;
top: 55%;
right: 40px;
top: 52%;
right: 23px;
transform: translateY(-50%);
}

Expand All @@ -42,7 +42,16 @@
font-weight: 400;
line-height: normal;
color: #fff;
top: 55%;
right: 40px;
top: 51%;
right: 23px;
transform: translateY(-50%);
}

.custom-input-normal .ant-input-suffix .anticon-loading {
position: absolute;
top: 35%;
right: 28px;
cursor: pointer;
font-size: 14px;
line-height: 14px;
}
32 changes: 32 additions & 0 deletions source/components/Modal/WarningBaseModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,35 @@ export const CreatedAccountSuccessfully = ({
</ModalBase>
);
};

export const RPCSuccessfullyAdded = ({
phraseOne,
onClose,
show = true,
title,
}: IDefaultModal) => {
const { t } = useTranslation();
const navigate = useNavigate();

return (
<ModalBase onClose={onClose} show={show}>
<div className="rounded-t-[50px] w-screen flex flex-col align-bottom justify-end items-center bg-brand-blue400 shadow-md">
<div className="bg-[#476daa] w-full py-5 rounded-t-[50px]">
<h1 className="text-white font-medium text-base">{title}</h1>
</div>
<div className="flex flex-col pt-6 pb-7 px-6 text-white text-left text-sm font-normal w-[94%]">
<p>{phraseOne}</p>
</div>

<Button
id="btn-ok"
type="submit"
className="bg-white w-[22rem] h-10 text-brand-blue200 text-base mb-12 font-base font-medium rounded-2xl"
onClick={() => navigate('/settings/networks/edit')}
>
{t('buttons.ok')}
</Button>
</div>
</ModalBase>
);
};
158 changes: 81 additions & 77 deletions source/components/TransactionOptions/TransactionOptions.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Menu, Transition } from '@headlessui/react';
import React from 'react';
import React, { useCallback } from 'react';
import { Fragment } from 'react';
import { useTranslation } from 'react-i18next';

Expand All @@ -19,6 +19,7 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
}) => {
const isLegacyTransaction =
transaction.type === 0 || String(transaction.type) === '0x0';

const { t } = useTranslation();
const { navigate } = useUtils();

Expand Down Expand Up @@ -70,6 +71,16 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
break;
}
};

const handleGoTxDetails = useCallback(() => {
navigate('/home/details', {
state: {
id: null,
hash: transaction.hash,
},
});
}, [transaction.hash]);

return (
<>
<Menu
Expand All @@ -80,12 +91,10 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
<Menu.Button
className="inline-flex justify-center w-full
hover:text-button-primaryhover text-white text-sm font-medium
hover:bg-opacity-30 rounded-full focus:outline-none
focus-visible:ring-2 focus-visible:ring-white
focus-visible:ring-opacity-75"
hover:bg-opacity-30 rounded-full"
>
<IconButton className="w-5">
<Icon isSvg={true} name="EditTx" className="text-base" />
<Icon isSvg name="EditTx" className="text-base" />
</IconButton>
</Menu.Button>

Expand All @@ -98,87 +107,82 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
leaveFrom="transform opacity-100 scale-100"
leaveTo="transform opacity-0 scale-95"
>
<Menu.Items
as="div"
className="p-6 absolute right-0 z-10 w-[23rem] origin-top-right rounded-lg bg-brand-blue500 shadow-2xl ring-1
<div className="absolute right-0 z-10 h-[15rem]">
<Menu.Items
as="div"
className="p-6 absolute right-0 z-10 w-[23rem] origin-top-right rounded-lg bg-brand-blue500 shadow-2xl ring-1
font-poppins ring-black ring-opacity-5 focus:outline-none transition-all duration-300 ease-in-out cursor-pointer"
>
<h1 className="text-sm font-semibold text-brand-gray200 pb-4">
PENDING TRANSACTION
</h1>
<Menu.Item>
{({ active }) => (
<li
className={`
>
<h1 className="text-sm font-semibold text-brand-gray200 pb-4">
PENDING TRANSACTION
</h1>
<Menu.Item>
{({ active }) => (
<li
className={`
${active ? 'font-semibold' : 'font-normal'}
flex items-center justify-start text-brand-white mb-4 w-full
`}
onClick={() =>
navigate('/home/details', {
state: {
id: null,
hash: transaction.hash,
},
})
}
>
<IconButton className="w-5 mr-3">
<Icon
name="externalLink"
isSvg={true}
className="text-base text-brand-white"
/>
</IconButton>
<span className="text-sm text-brand-white">
See on the block explorer
</span>
</li>
)}
</Menu.Item>
<Menu.Item>
{({ active }) => (
<li
className={`
onClick={handleGoTxDetails}
>
<IconButton className="w-5 mr-3">
<Icon
name="externalLink"
isSvg
className="text-base text-brand-white"
/>
</IconButton>
<span className="text-sm text-brand-white">
See on the block explorer
</span>
</li>
)}
</Menu.Item>
<Menu.Item>
{({ active }) => (
<li
className={`
${active ? 'font-semibold' : 'font-normal'}
flex items-center justify-start text-brand-white mb-4 w-full
`}
onClick={() => handleOnClick(UpdateTxAction.SpeedUp)}
>
<IconButton className="w-5 mr-3">
<Icon
name="SpeedUp"
isSvg={true}
className="text-base text-brand-white"
/>
</IconButton>
<span className="text-sm text-brand-white">
{t('header.speedUp')}
</span>
</li>
)}
</Menu.Item>
<Menu.Item>
{({ active }) => (
<li
className={`
onClick={() => handleOnClick(UpdateTxAction.SpeedUp)}
>
<IconButton className="w-5 mr-3">
<Icon
name="SpeedUp"
isSvg
className="text-base text-brand-white"
/>
</IconButton>
<span className="text-sm text-brand-white">
{t('header.speedUp')}
</span>
</li>
)}
</Menu.Item>
<Menu.Item>
{({ active }) => (
<li
className={`
${active ? 'font-semibold ' : 'font-normal'}
flex items-center justify-start w-full `}
onClick={() => handleOnClick(UpdateTxAction.Cancel)}
>
<IconButton className="w-5 mr-3">
<Icon
name="Trash"
isSvg={true}
className="text-base text-brand-white"
/>
</IconButton>
<span className="text-sm text-brand-white">
{t('buttons.cancel')}
</span>
</li>
)}
</Menu.Item>
</Menu.Items>
onClick={() => handleOnClick(UpdateTxAction.Cancel)}
>
<IconButton className="w-5 mr-3">
<Icon
name="Trash"
isSvg
className="text-base text-brand-white"
/>
</IconButton>
<span className="text-sm text-brand-white">
{t('buttons.cancel')}
</span>
</li>
)}
</Menu.Item>
</Menu.Items>
</div>
</Transition>
</Menu>
</>
Expand Down
Loading
Loading