Skip to content

Commit 998299d

Browse files
lucaslovatolucaslovato
authored
Add skelleton loader (#691)
1 parent c9155f7 commit 998299d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1101
-899
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
touch .env
2828
echo REACT_APP_SEED_LAW_COOK=${{ secrets.SEED_LAW_COOK }} >> .env
2929
echo REACT_APP_SEED_PEACE_GLOBE=${{ secrets.SEED_PEACE_GLOBE }} >> .env
30-
echo REACT_APP_SEED_SWALLOW_HEALTH=${{ secrets.SEED_SWALLOW_HEALTH }} >> .env
30+
echo REACT_APP_SEED_SWALLOW_HEALTH=${{ secrets.SEED_SWALLOW_HEALTH }} >> .env

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ jobs:
7676
asset_name: ${{ env.ASSET_NAME_CANARY }}
7777
asset_content_type: application/zip
7878
env:
79-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
79+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎jest.config.json‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
{
22
"collectCoverage": true,
3-
"moduleFileExtensions": [
4-
"js",
5-
"mjs",
6-
"ts",
7-
"json"
8-
],
9-
"moduleDirectories": [
10-
"source",
11-
"node_modules"
12-
],
13-
"modulePathIgnorePatterns": [
14-
"tests"
15-
],
3+
"moduleFileExtensions": ["js", "mjs", "ts", "json"],
4+
"moduleDirectories": ["source", "node_modules"],
5+
"modulePathIgnorePatterns": ["tests"],
166
"transform": {
177
"^.+\\.ts$": "ts-jest",
188
"^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": "babel-jest"
@@ -22,7 +12,5 @@
2212
],
2313
"testTimeout": 30000,
2414
"testRegex": "((\\.|/*.)(spec)|(test))\\.ts?$",
25-
"setupFilesAfterEnv": [
26-
"./jest.setup.js"
27-
]
28-
}
15+
"setupFilesAfterEnv": ["./jest.setup.js"]
16+
}

‎manifest.json‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 3,
33
"name": "Pali Wallet",
4-
"version": "3.0.2",
4+
"version": "3.4.1",
55
"icons": {
66
"16": "assets/icons/favicon-16.png",
77
"32": "assets/icons/favicon-32.png",
@@ -11,13 +11,12 @@
1111
"description": "A Non-Custodial Crypto Wallet",
1212
"short_name": "pali",
1313
"permissions": [
14+
"alarms",
1415
"storage",
1516
"activeTab",
1617
"clipboardWrite",
1718
"unlimitedStorage",
18-
"offscreen",
19-
"scripting",
20-
"webRequest"
19+
"scripting"
2120
],
2221
"host_permissions": [
2322
"http://*/*",
@@ -56,15 +55,6 @@
5655
"js": [
5756
"js/contentScript.bundle.js"
5857
]
59-
},
60-
{
61-
"matches": [
62-
"*://connect.trezor.io/9/popup.html",
63-
"https://localhost:8088/*"
64-
],
65-
"js": [
66-
"js/trezorScript.bundle.js"
67-
]
6858
}
6959
],
7060
"web_accessible_resources": [

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "paliwallet",
3-
"version": "3.4.0",
3+
"version": "3.4.1",
44
"description": "A Non-Custodial Crypto Wallet",
55
"private": true,
66
"repository": {

‎source/assets/locales/en.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -523,18 +523,18 @@
523523
"anyoneWithThisInfo": "Anyone with this information is able to steal your funds."
524524
},
525525
"faucet": {
526-
"grabTextOne":"Grab ${{token}} with our faucet!",
527-
"grabTextTwo":"Grab ${{token}} with our faucet on the {{rpcName}}!",
528-
"pleaseWait":"Please wait while we work our magic...",
529-
"doNotClose":"Do not close the wallet.",
530-
"ERROR":"ERROR!",
531-
"CONGRATULATIONS":"CONGRATULATIONS!",
532-
"someHasJust":"Some {{tokenSymbol}} has just been sent to your {{networkName}} wallet.",
533-
"transactionHash":"Transaction hash",
526+
"grabTextOne": "Grab ${{token}} with our faucet!",
527+
"grabTextTwo": "Grab ${{token}} with our faucet on the {{rpcName}}!",
528+
"pleaseWait": "Please wait while we work our magic...",
529+
"doNotClose": "Do not close the wallet.",
530+
"ERROR": "ERROR!",
531+
"CONGRATULATIONS": "CONGRATULATIONS!",
532+
"someHasJust": "Some {{tokenSymbol}} has just been sent to your {{networkName}} wallet.",
533+
"transactionHash": "Transaction hash",
534534
"requestNow": "Request Now",
535535
"Close": "Close",
536536
"tryAgain": "Try again",
537537
"withOurFaucet": "Grab {{token}} with our faucet to begin experiencing the {{networkName}} network!",
538538
"youCanGet": "You can get {{quantity}} {{token}} per wallet address every 24h."
539539
}
540-
}
540+
}

‎source/assets/locales/es.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,4 +537,4 @@
537537
"withOurFaucet": "¡Obtén {{token}} con nuestra llave para comenzar a experimentar la red {{networkName}}!",
538538
"youCanGet": "Puedes obtener {{quantity}} {{token}} por dirección de billetera cada 24 horas."
539539
}
540-
}
540+
}

‎source/assets/locales/pt-br.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,4 +395,4 @@
395395
"importWallet": "Importar billetera",
396396
"congratulations": "PARABÉNS!"
397397
}
398-
}
398+
}

‎source/assets/styles/custom-autolock-input.css‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
font-size: 12px;
1111
}
1212

13-
1413
.custom-edit-input .ant-input {
1514
display: flex;
1615
width: 352px;
@@ -43,7 +42,7 @@
4342
cursor: pointer;
4443
font-size: 14px;
4544
line-height: 14px;
46-
}
45+
}
4746

4847
.custom-gas-input {
4948
display: flex;

‎source/components/Button/Button.tsx‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,19 @@ export const Button: React.FC<IButton> = ({
3939
width = '36',
4040
}) => (
4141
<button
42-
className={`${className} ${useDefaultWidth && `w-${width}`}`}
42+
className={`${className} ${useDefaultWidth && `w-${width}`} ${
43+
disabled || loading ? 'opacity-60 cursor-not-allowed' : ''
44+
} flex justify-center items-center`}
4345
disabled={disabled || loading}
4446
onClick={onClick}
4547
type={type}
4648
id={id}
4749
>
48-
{children}
50+
{loading ? (
51+
<Icon name="loading" color="#4d76b8" className="w-6 animate-spin-slow" />
52+
) : (
53+
children
54+
)}
4955
</button>
5056
);
5157

@@ -74,7 +80,7 @@ export const PrimaryButton: React.FC<IPrimaryButton> = ({
7480
disabled || loading
7581
? 'opacity-60 cursor-not-allowed'
7682
: 'opacity-100 hover:bg-button-primaryhover'
77-
} border-button-primary bg-button-primary text-brand-white w-${width}`}
83+
} border-button-primary bg-button-primary text-brand-white w-${width} flex justify-center items-center`}
7884
disabled={disabled || loading}
7985
onClick={onClick}
8086
type={type}
@@ -121,7 +127,7 @@ export const SecondButton: React.FC<IPrimaryButton> = ({
121127
disabled || loading
122128
? 'opacity-60 cursor-not-allowed'
123129
: 'opacity-100 hover:bg-button-primaryhover'
124-
} border-button-primary text-brand-white w-${width}`}
130+
} border-button-primary text-brand-white w-${width} flex justify-center items-center`}
125131
disabled={disabled || loading}
126132
onClick={onClick}
127133
type={type}
@@ -168,7 +174,7 @@ export const SecondaryButton: React.FC<IPrimaryButton> = ({
168174
disabled || loading
169175
? 'opacity-60 cursor-not-allowed'
170176
: 'opacity-100 hover:bg-button-secondaryhover'
171-
} border-button-secondary transition-all duration-300 bg-button-secondary text-brand-white w-36 py-2.5`}
177+
} border-button-secondary transition-all duration-300 bg-button-secondary text-brand-white w-36 py-2.5 flex justify-center items-center`}
172178
disabled={disabled || loading}
173179
onClick={onClick}
174180
type={type}
@@ -211,7 +217,7 @@ export const NeutralButton: React.FC<IPrimaryButton> = ({
211217
: 'opacity-100 hover:opacity-90'
212218
} border-button-neutral transition-all duration-300 bg-button-neutral py-2.5 ${
213219
extraStyles ? extraStyles : 'text-sm text-brand-royalblue'
214-
}`}
220+
} flex justify-center items-center`}
215221
disabled={disabled || loading}
216222
onClick={onClick}
217223
type={type}

0 commit comments

Comments
 (0)