Merge branch 'master' into toggle-css-changes

.github/workflows/production_deployment.yml

@@ -12,6 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: push to dockerhub
         uses: fylein/docker-release-action@master
+        id: generate-and-push-tag
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -33,17 +34,18 @@ jobs:
 
       - name: Update Image Tag
         run: |
-          NEW_TAG="v$(git rev-parse --short HEAD)"
+          NEW_TAG=${{ steps.generate-and-push-tag.outputs.new_tag }}
           cd ${{ vars.PROD_DEPLOY_REPO }}/${{ vars.PROD_US1_DEPLOY_DIR }}/integrations
           kustomize edit set image docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integrations-app=docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integrations-app:$NEW_TAG
 
       - name: Commit and push changes
         run: |
+          NEW_TAG=${{ steps.generate-and-push-tag.outputs.new_tag }}
           cd ${{ vars.PROD_DEPLOY_REPO }}/
           git config --global user.email "[email protected]"
           git config --global user.name "GitHub Actions"
           git add .
-          git commit -m "Update image tag"
+          git commit -m "Deployed fyle_integrations-app:$NEW_TAG"
           git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ vars.PROD_DEPLOY_REPO }}
           git pull origin master
           git push origin master

src/app/integrations/qbo/qbo-onboarding/qbo-onboarding-connector/qbo-onboarding-connector.component.ts

@@ -196,7 +196,7 @@ export class QboOnboardingConnectorComponent implements OnInit, OnDestroy {
         this.warningEvent = ConfigurationWarningEvent.INCORRECT_QBO_ACCOUNT_CONNECTED;
         this.isWarningDialogVisible = true;
       } else {
-        this.toastService.displayToastMessage(ToastSeverity.ERROR, errorMessage);
+        this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Something went wrong, please try again.');
         this.router.navigate([`/integrations/qbo/onboarding/landing`]);
       }
     });

src/app/integrations/qbo/qbo-onboarding/qbo-onboarding-landing/qbo-onboarding-landing.component.ts

@@ -70,7 +70,7 @@ export class QboOnboardingLandingComponent implements OnInit, OnDestroy {
       if (errorMessage === 'Please choose the correct QuickBooks Online account') {
         this.isIncorrectQBOConnectedDialogVisible = true;
       } else {
-        this.toastService.displayToastMessage(ToastSeverity.ERROR, errorMessage);
+        this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Something went wrong, please try again.');
         this.router.navigate([`/integrations/qbo/onboarding/landing`]);
       }
     });