From e532bcb8ff8e66ee97bea474386261f2f96dffd7 Mon Sep 17 00:00:00 2001 From: Gavrila Andrei Date: Mon, 30 Oct 2023 17:57:41 +0200 Subject: [PATCH 1/4] Fix transactions empty state message --- src/pages/Dashboard/widgets/Transactions/Transactions.tsx | 6 +++--- src/pages/Home/Home.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Dashboard/widgets/Transactions/Transactions.tsx b/src/pages/Dashboard/widgets/Transactions/Transactions.tsx index 36a02f1d..bde355e2 100644 --- a/src/pages/Dashboard/widgets/Transactions/Transactions.tsx +++ b/src/pages/Dashboard/widgets/Transactions/Transactions.tsx @@ -22,10 +22,10 @@ export const Transactions = (payload: TransactionsPropsType) => { getTransactions(); }, []); - if (!isLoading && !transactions) { + if (!isLoading && transactions.length === 0) { return ( -

No transactions found

+

No transactions found

 ); } @@ -33,7 +33,7 @@ export const Transactions = (payload: TransactionsPropsType) => { return (
-
+
diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx index fdce9a1a..2d70b6a8 100644 --- a/src/pages/Home/Home.tsx +++ b/src/pages/Home/Home.tsx @@ -35,7 +35,7 @@ export const Home = () => { -
+
From 7436c789d8990c191bb93e68347d811310c09ec2 Mon Sep 17 00:00:00 2001 From: Gavrila Andrei Date: Mon, 30 Oct 2023 19:07:44 +0200 Subject: [PATCH 2/4] Update deployment files --- .../{deploy.yml => deploy-devnet.yml} | 10 ++--- .github/workflows/deploy-mainnet.yml | 44 +++++++++++++++++++ .github/workflows/deploy-testnet.yml | 44 +++++++++++++++++++ 3 files changed, 93 insertions(+), 5 deletions(-) rename .github/workflows/{deploy.yml => deploy-devnet.yml} (85%) create mode 100644 .github/workflows/deploy-mainnet.yml create mode 100644 .github/workflows/deploy-testnet.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy-devnet.yml similarity index 85% rename from .github/workflows/deploy.yml rename to .github/workflows/deploy-devnet.yml index 0c681334..e1f6dfef 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy-devnet.yml @@ -1,10 +1,10 @@ -name: deploy +name: deploy-devnet on: push: branches: [main] repository_dispatch: - types: deploy + types: deploy-devnet workflow_dispatch: jobs: @@ -32,13 +32,13 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: 'us-east-1' - name: Deploy to S3 bucket - run: aws s3 sync ./build/ s3://${{ secrets.AWS_S3_BUCKET }} --delete + run: aws s3 sync ./build/ s3://${{ secrets.AWS_S3_BUCKET_DEVNET }} --delete - name: Slack Notification uses: rtCamp/action-slack-notify@master env: SLACK_ICON_EMOJI: ':nerd_face:' - SLACK_USERNAME: ${{ secrets.AWS_S3_BUCKET }} - SLACK_MESSAGE: ${{ secrets.AWS_S3_BUCKET }} + SLACK_USERNAME: ${{ secrets.AWS_S3_BUCKET_DEVNET }} + SLACK_MESSAGE: ${{ secrets.AWS_S3_BUCKET_DEVNET }} SLACK_FOOTER: '' MSG_MINIMAL: true SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/deploy-mainnet.yml b/.github/workflows/deploy-mainnet.yml new file mode 100644 index 00000000..688c6f8f --- /dev/null +++ b/.github/workflows/deploy-mainnet.yml @@ -0,0 +1,44 @@ +name: deploy-mainnet + +on: + push: + branches: [main] + repository_dispatch: + types: deploy-mainnet + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + ref: main + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: '16.x' + - name: Setup yarn + run: npm install -g yarn + - run: yarn install + - run: yarn build:mainnet + env: + CI: false + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: 'us-east-1' + - name: Deploy to S3 bucket + run: aws s3 sync ./build/ s3://${{ secrets.AWS_S3_BUCKET_MAINNET }} --delete + - name: Slack Notification + uses: rtCamp/action-slack-notify@master + env: + SLACK_ICON_EMOJI: ':nerd_face:' + SLACK_USERNAME: ${{ secrets.AWS_S3_BUCKET_MAINNET }} + SLACK_MESSAGE: ${{ secrets.AWS_S3_BUCKET_MAINNET }} + SLACK_FOOTER: '' + MSG_MINIMAL: true + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/deploy-testnet.yml b/.github/workflows/deploy-testnet.yml new file mode 100644 index 00000000..986fd63b --- /dev/null +++ b/.github/workflows/deploy-testnet.yml @@ -0,0 +1,44 @@ +name: deploy-testnet + +on: + push: + branches: [main] + repository_dispatch: + types: deploy-testnet + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + ref: main + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: '16.x' + - name: Setup yarn + run: npm install -g yarn + - run: yarn install + - run: yarn build:testnet + env: + CI: false + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: 'us-east-1' + - name: Deploy to S3 bucket + run: aws s3 sync ./build/ s3://${{ secrets.AWS_S3_BUCKET_TESTNET }} --delete + - name: Slack Notification + uses: rtCamp/action-slack-notify@master + env: + SLACK_ICON_EMOJI: ':nerd_face:' + SLACK_USERNAME: ${{ secrets.AWS_S3_BUCKET_TESTNET }} + SLACK_MESSAGE: ${{ secrets.AWS_S3_BUCKET_TESTNET }} + SLACK_FOOTER: '' + MSG_MINIMAL: true + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} From 1a4246b6606c4f4bf5e762d1b8e256f16d18b2af Mon Sep 17 00:00:00 2001 From: tudorgabriel Date: Tue, 31 Oct 2023 12:20:15 +0200 Subject: [PATCH 3/4] Th/e2e fix (#150) * base url updated --- cypress.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.config.ts b/cypress.config.ts index 205512ea..bdf484e1 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'cypress'; export default defineConfig({ e2e: { - baseUrl: 'https://integration-template-dapp.multiversx.com', + baseUrl: 'https://integration.template-dapp.multiversx.com/', defaultCommandTimeout: 30000, responseTimeout: 70000, requestTimeout: 70000, From 5b4eb1f047ab5487631e0c75e6aa8472d378e0da Mon Sep 17 00:00:00 2001 From: cipriandraghici Date: Tue, 31 Oct 2023 13:19:11 +0200 Subject: [PATCH 4/4] add SC addresses for all ENVs --- src/config/config.mainnet.ts | 3 ++- src/config/config.testnet.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/config/config.mainnet.ts b/src/config/config.mainnet.ts index 143ec515..4cd5b0f0 100644 --- a/src/config/config.mainnet.ts +++ b/src/config/config.mainnet.ts @@ -2,7 +2,8 @@ import { EnvironmentsEnum } from 'types'; export * from './sharedConfig'; -export const contractAddress = ''; +export const contractAddress = + 'erd1qqqqqqqqqqqqqpgq6wvtphapx0xju6mgk65aryzecat4fcry9l5qycup8h'; export const API_URL = 'https://template-api.multiversx.com'; export const sampleAuthenticatedDomains = [API_URL]; export const environment = EnvironmentsEnum.mainnet; diff --git a/src/config/config.testnet.ts b/src/config/config.testnet.ts index 30a112f5..80005c00 100644 --- a/src/config/config.testnet.ts +++ b/src/config/config.testnet.ts @@ -2,7 +2,8 @@ import { EnvironmentsEnum } from 'types'; export * from './sharedConfig'; -export const contractAddress = ''; +export const contractAddress = + 'erd1qqqqqqqqqqqqqpgq4rnqmppypqdy263c9qjsy8uwurts47uv9l5q028464'; export const API_URL = 'https://testnet-template-api.multiversx.com'; export const sampleAuthenticatedDomains = [API_URL]; export const environment = EnvironmentsEnum.testnet;