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

Draft: Pre release #598

Closed
wants to merge 8 commits into from
Closed
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
51 changes: 51 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Release

on:
push:
branches:
- pre-release
- master
- develop

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '18'

- name: Install dependencies
run: yarn install

- name: Build project for Chrome
run: yarn run build:chrome

- name: List files in build directory
run: ls -l ./build

- name: Create a draft release
id: create_release
uses: actions/create-release@v1
with:
tag_name: v${{ github.event.repository.name }}-${{ github.ref_name }}-release
release_name: Release ${{ github.event.repository.name }} for ${{ github.ref_name }}
draft: true
prerelease: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload zip to release
uses: actions/upload-release-asset@v1
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./build/chrome.zip
asset_name: chrome.zip
asset_content_type: application/zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 0 additions & 4 deletions source/assets/images/faucet-error.svg

This file was deleted.

4 changes: 0 additions & 4 deletions source/assets/images/faucet-loading.svg

This file was deleted.

5 changes: 0 additions & 5 deletions source/assets/images/faucet-success.svg

This file was deleted.

Binary file removed source/assets/images/faucetmodal.png
Binary file not shown.
15 changes: 0 additions & 15 deletions source/assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -521,20 +521,5 @@
"walletSeedPhrasePage": {
"keepSeedPhrase": "Keep your seed phrase secret!",
"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",
"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."
}
}
15 changes: 0 additions & 15 deletions source/assets/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -521,20 +521,5 @@
"walletSeedPhrasePage": {
"keepSeedPhrase": "¡Mantén en secreto tu seed frase!",
"anyoneWithThisInfo": "Cualquier persona con esta información puede robar tus fondos."
},
"faucet": {
"grabTextOne": "¡Obtén ${{token}} con nuestra llave!",
"grabTextTwo": "¡Obtén ${{token}} con nuestra llave en el {{rpcName}}!",
"pleaseWait": "Por favor, espere mientras hacemos nuestra magia...",
"doNotClose": "No cierres la billetera.",
"ERROR": "¡ERROR!",
"CONGRATULATIONS": "¡FELICITACIONES!",
"someHasJust": "Algo de {{tokenSymbol}} acaba de ser enviado a tu billetera de {{networkName}}.",
"transactionHash": "Hash de transacción",
"requestNow": "Solicitar ahora",
"Close": "Cerrar",
"tryAgain": "Intentar de nuevo",
"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."
}
}
17 changes: 1 addition & 16 deletions source/assets/locales/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -393,20 +393,5 @@
"transactionDetails": "DETALLES DE LA TRANSACCIÓN",
"importWallet": "Importar billetera",
"congratulations": "PARABÉNS!"
},
"faucet": {
"grabTextOne": "Pegue ${{token}} com nossa torneira!",
"grabTextTwo": "Pegue ${{token}} com nossa torneira no {{rpcName}}!",
"pleaseWait": "Por favor, aguarde enquanto trabalhamos nossa mágica...",
"doNotClose": "Não feche a carteira.",
"ERROR": "ERRO!",
"CONGRATULATIONS": "PARABÉNS!",
"someHasJust": "Algum {{tokenSymbol}} acabou de ser enviado para sua carteira {{networkName}}.",
"transactionHash": "Hash da transação",
"requestNow": "Solicitar agora",
"Close": "Fechar",
"tryAgain": "Tentar novamente",
"withOurFaucet": "Pegue {{token}} com nossa torneira para começar a experimentar a rede {{networkName}}!",
"youCanGet": "Você pode obter {{quantity}} {{token}} por endereço de carteira a cada 24 horas."
}
}
}
2 changes: 1 addition & 1 deletion source/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const Header: React.FC<IHeader> = ({ accountHeader = false }) => {

return (
<div className={accountHeader ? 'pb-32' : 'pb-12'}>
<div className="fixed z-[888] w-full md:max-w-2xl">
<div className="fixed z-50 w-full md:max-w-2xl">
<div className="relative flex items-center justify-between p-2 py-6 w-full text-gray-300 bg-bkg-1">
<NetworkMenu
setActiveAccountModalIsOpen={setIsOpen}
Expand Down
2 changes: 1 addition & 1 deletion source/components/Header/Menus/GeneralMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const GeneralMenu: React.FC = () => {
return (
<Menu
as="div"
className="absolute z-[9999] right-4 top-2 flex items-center gap-2 justify-evenly"
className="absolute right-4 top-2 flex items-center gap-2 justify-evenly"
>
<Tooltip content={truncate(currentTab.host)}>
<div
Expand Down
44 changes: 15 additions & 29 deletions source/components/Header/Menus/NetworkMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import btcIcon from 'assets/images/btcIcon.svg';
import ethIcon from 'assets/images/ethIcon.svg';
import { Icon } from 'components/index';
import { useUtils } from 'hooks/index';
import { FaucetChainIds } from 'scripts/Background/controllers/message-handler/types';
import { RootState } from 'state/store';
import { getController } from 'utils/browser';
import { NetworkType } from 'utils/types';
Expand Down Expand Up @@ -114,7 +113,7 @@ export const NetworkMenu: React.FC<INetworkComponent> = (
return (
<Menu
as="div"
className="absolute z-[888] w-full left-4 inline-block mr-8 text-left"
className="absolute w-full left-4 inline-block mr-8 text-left"
>
{(menuprops) => (
<>
Expand Down Expand Up @@ -251,13 +250,11 @@ export const NetworkMenu: React.FC<INetworkComponent> = (
activeNetworkValidator(
currentNetwork
) && (
<div className="absolute items-center flex gap-2 right-[1rem] ">
<Icon
name="check"
className="w-4 relative bottom-0.5"
wrapperClassname="w-6"
/>
</div>
<Icon
name="check"
className="absolute left-[21.5rem] bottom-2 w-4"
wrapperClassname="w-6"
/>
)}
</li>
)
Expand Down Expand Up @@ -307,7 +304,7 @@ export const NetworkMenu: React.FC<INetworkComponent> = (
: index === arr.length - 1
? 'rounded-bl-lg rounded-br-lg'
: 'border-b border-dashed border-gray-600'
} flex relative flex-row items-center justify-start mx-auto p-2 max-w-95 text-white text-sm font-medium active:bg-opacity-40 bg-brand-blue500 focus:outline-none cursor-pointer transform transition duration-300`}
} flex flex-row items-center justify-start mx-auto p-2 max-w-95 text-white text-sm font-medium active:bg-opacity-40 bg-brand-blue500 focus:outline-none cursor-pointer transform transition duration-300`}
onClick={() =>
handleChangeNetwork(
currentNetwork,
Expand All @@ -318,26 +315,15 @@ export const NetworkMenu: React.FC<INetworkComponent> = (
<span className="ml-8 text-left">
{currentNetwork.label}
</span>
<div className="absolute items-center flex gap-2 right-[1rem] ">
{!isBitcoinBased &&
activeNetworkValidator(currentNetwork) && (
<Icon
name="check"
className="w-4 relative bottom-0.5"
wrapperClassname="w-6"
/>
)}
{Object.values(FaucetChainIds).includes(
currentNetwork.chainId
) && (
<div className="flex justify-center w-[81px] h-max bg-alpha-whiteAlpha200 rounded-[100px] items-center gap-2 py-[2px] px-1 ">
<div className="w-2 h-2 bg-brand-green rounded-full" />
<p className="text-xs text-white">
Faucet
</p>
</div>

{!isBitcoinBased &&
activeNetworkValidator(currentNetwork) && (
<Icon
name="check"
className="absolute left-[21.5rem] bottom-2 w-4"
wrapperClassname="w-6"
/>
)}
</div>
</li>
))}
</Disclosure.Panel>
Expand Down
31 changes: 0 additions & 31 deletions source/components/Modal/FaucetAccessModal.tsx

This file was deleted.

48 changes: 0 additions & 48 deletions source/components/Modal/FaucetModal.tsx

This file was deleted.

Loading
Loading