Development (#148)

* Fix transactions empty state message * Update deployment files
multiversx · Oct 30, 2023 · 9d038ba · 9d038ba
1 parent fd8cc70
commit 9d038ba
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 9 deletions.
diff --git a/.github/workflows/deploy.yml → .github/workflows/deploy-devnet.yml b/.github/workflows/deploy.yml → .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
@@ -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
@@ -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 }}
diff --git a/src/pages/Dashboard/widgets/Transactions/Transactions.tsx b/src/pages/Dashboard/widgets/Transactions/Transactions.tsx
@@ -22,18 +22,18 @@ export const Transactions = (payload: TransactionsPropsType) => {
     getTransactions();
   }, []);
 
-  if (!isLoading && !transactions) {
+  if (!isLoading && transactions.length === 0) {
     return (
       <OutputContainer>
-        <p>No transactions found</p>
+        <p className='text-gray-400'>No transactions found</p>
       </OutputContainer>
     );
   }
 
   return (
     <div className='flex flex-col'>
       <OutputContainer isLoading={isLoading} className='p-0'>
-        <div className='w-full h-full bg-gray-100 overflow-x-auto bg-white shadow rounded-lg'>
+        <div className='w-full h-full overflow-x-auto bg-white shadow rounded-lg'>
           <table className='w-full divide-y divide-gray-200 overflow-auto table-auto'>
             <thead className='bg-gray-50'>
               <tr>

diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx
@@ -35,7 +35,7 @@ export const Home = () => {
               <Transaction />
             </div>
           </div>
-          <div className='h-4/6 bg-mvx-white bg-contain bg-center bg-no-repeat w-1/2 bg-center' />
+          <div className='h-4/6 bg-mvx-white bg-contain bg-no-repeat w-1/2 bg-center' />
         </div>
       </PageWrapper>
     </AuthRedirectWrapper>