Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
touch .env
echo REACT_APP_SEED_LAW_COOK=${{ secrets.SEED_LAW_COOK }} >> .env
echo REACT_APP_SEED_PEACE_GLOBE=${{ secrets.SEED_PEACE_GLOBE }} >> .env
echo REACT_APP_SEED_SWALLOW_HEALTH=${{ secrets.SEED_SWALLOW_HEALTH }} >> .env
echo REACT_APP_SEED_SWALLOW_HEALTH=${{ secrets.SEED_SWALLOW_HEALTH }} >> .env
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ jobs:
asset_name: ${{ env.ASSET_NAME_CANARY }}
asset_content_type: application/zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22 changes: 5 additions & 17 deletions jest.config.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
{
"collectCoverage": true,
"moduleFileExtensions": [
"js",
"mjs",
"ts",
"json"
],
"moduleDirectories": [
"source",
"node_modules"
],
"modulePathIgnorePatterns": [
"tests"
],
"moduleFileExtensions": ["js", "mjs", "ts", "json"],
"moduleDirectories": ["source", "node_modules"],
"modulePathIgnorePatterns": ["tests"],
"transform": {
"^.+\\.ts$": "ts-jest",
"^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": "babel-jest"
Expand All @@ -22,7 +12,5 @@
],
"testTimeout": 30000,
"testRegex": "((\\.|/*.)(spec)|(test))\\.ts?$",
"setupFilesAfterEnv": [
"./jest.setup.js"
]
}
"setupFilesAfterEnv": ["./jest.setup.js"]
}
16 changes: 3 additions & 13 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "Pali Wallet",
"version": "3.0.2",
"version": "3.4.1",
"icons": {
"16": "assets/icons/favicon-16.png",
"32": "assets/icons/favicon-32.png",
Expand All @@ -11,13 +11,12 @@
"description": "A Non-Custodial Crypto Wallet",
"short_name": "pali",
"permissions": [
"alarms",
"storage",
"activeTab",
"clipboardWrite",
"unlimitedStorage",
"offscreen",
"scripting",
"webRequest"
"scripting"
],
"host_permissions": [
"http://*/*",
Expand Down Expand Up @@ -56,15 +55,6 @@
"js": [
"js/contentScript.bundle.js"
]
},
{
"matches": [
"*://connect.trezor.io/9/popup.html",
"https://localhost:8088/*"
],
"js": [
"js/trezorScript.bundle.js"
]
}
],
"web_accessible_resources": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paliwallet",
"version": "3.4.0",
"version": "3.4.1",
"description": "A Non-Custodial Crypto Wallet",
"private": true,
"repository": {
Expand Down
18 changes: 9 additions & 9 deletions source/assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -523,18 +523,18 @@
"anyoneWithThisInfo": "Anyone with this information is able to steal your funds."
},
"faucet": {
"grabTextOne":"Grab ${{token}} with our faucet!",
"grabTextTwo":"Grab ${{token}} with our faucet on the {{rpcName}}!",
"pleaseWait":"Please wait while we work our magic...",
"doNotClose":"Do not close the wallet.",
"ERROR":"ERROR!",
"CONGRATULATIONS":"CONGRATULATIONS!",
"someHasJust":"Some {{tokenSymbol}} has just been sent to your {{networkName}} wallet.",
"transactionHash":"Transaction hash",
"grabTextOne": "Grab ${{token}} with our faucet!",
"grabTextTwo": "Grab ${{token}} with our faucet on the {{rpcName}}!",
"pleaseWait": "Please wait while we work our magic...",
"doNotClose": "Do not close the wallet.",
"ERROR": "ERROR!",
"CONGRATULATIONS": "CONGRATULATIONS!",
"someHasJust": "Some {{tokenSymbol}} has just been sent to your {{networkName}} wallet.",
"transactionHash": "Transaction hash",
"requestNow": "Request Now",
"Close": "Close",
"tryAgain": "Try again",
"withOurFaucet": "Grab {{token}} with our faucet to begin experiencing the {{networkName}} network!",
"youCanGet": "You can get {{quantity}} {{token}} per wallet address every 24h."
}
}
}
2 changes: 1 addition & 1 deletion source/assets/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -537,4 +537,4 @@
"withOurFaucet": "¡Obtén {{token}} con nuestra llave para comenzar a experimentar la red {{networkName}}!",
"youCanGet": "Puedes obtener {{quantity}} {{token}} por dirección de billetera cada 24 horas."
}
}
}
2 changes: 1 addition & 1 deletion source/assets/locales/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,4 +395,4 @@
"importWallet": "Importar billetera",
"congratulations": "PARABÉNS!"
}
}
}
3 changes: 1 addition & 2 deletions source/assets/styles/custom-autolock-input.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
font-size: 12px;
}


.custom-edit-input .ant-input {
display: flex;
width: 352px;
Expand Down Expand Up @@ -43,7 +42,7 @@
cursor: pointer;
font-size: 14px;
line-height: 14px;
}
}

.custom-gas-input {
display: flex;
Expand Down
18 changes: 12 additions & 6 deletions source/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@ export const Button: React.FC<IButton> = ({
width = '36',
}) => (
<button
className={`${className} ${useDefaultWidth && `w-${width}`}`}
className={`${className} ${useDefaultWidth && `w-${width}`} ${
disabled || loading ? 'opacity-60 cursor-not-allowed' : ''
} flex justify-center items-center`}
disabled={disabled || loading}
onClick={onClick}
type={type}
id={id}
>
{children}
{loading ? (
<Icon name="loading" color="#4d76b8" className="w-6 animate-spin-slow" />
) : (
children
)}
</button>
);

Expand Down Expand Up @@ -74,7 +80,7 @@ export const PrimaryButton: React.FC<IPrimaryButton> = ({
disabled || loading
? 'opacity-60 cursor-not-allowed'
: 'opacity-100 hover:bg-button-primaryhover'
} border-button-primary bg-button-primary text-brand-white w-${width}`}
} border-button-primary bg-button-primary text-brand-white w-${width} flex justify-center items-center`}
disabled={disabled || loading}
onClick={onClick}
type={type}
Expand Down Expand Up @@ -121,7 +127,7 @@ export const SecondButton: React.FC<IPrimaryButton> = ({
disabled || loading
? 'opacity-60 cursor-not-allowed'
: 'opacity-100 hover:bg-button-primaryhover'
} border-button-primary text-brand-white w-${width}`}
} border-button-primary text-brand-white w-${width} flex justify-center items-center`}
disabled={disabled || loading}
onClick={onClick}
type={type}
Expand Down Expand Up @@ -168,7 +174,7 @@ export const SecondaryButton: React.FC<IPrimaryButton> = ({
disabled || loading
? 'opacity-60 cursor-not-allowed'
: 'opacity-100 hover:bg-button-secondaryhover'
} border-button-secondary transition-all duration-300 bg-button-secondary text-brand-white w-36 py-2.5`}
} border-button-secondary transition-all duration-300 bg-button-secondary text-brand-white w-36 py-2.5 flex justify-center items-center`}
disabled={disabled || loading}
onClick={onClick}
type={type}
Expand Down Expand Up @@ -211,7 +217,7 @@ export const NeutralButton: React.FC<IPrimaryButton> = ({
: 'opacity-100 hover:opacity-90'
} border-button-neutral transition-all duration-300 bg-button-neutral py-2.5 ${
extraStyles ? extraStyles : 'text-sm text-brand-royalblue'
}`}
} flex justify-center items-center`}
disabled={disabled || loading}
onClick={onClick}
type={type}
Expand Down
Loading
Loading