New feedback form

src/components/footer/index.tsx

@@ -1,4 +1,5 @@
 import { Box, FooterLanding } from '@vtex/brand-ui'
+import { useRouter } from 'next/router'
 import { getMessages } from 'utils/get-messages'
 import styles from './styles'
 import {
@@ -9,6 +10,8 @@ import {
 } from 'utils/get-url'
 
 const messages = getMessages()
+const router = useRouter()
+const currentPage = router.asPath.split('?')[0]
 
 const links = [
   {
@@ -25,7 +28,7 @@ const links = [
   },
   {
     message: messages['landing_page_footer_feedback.message'],
-    to: () => getFeedbackURL(),
+    to: () => `${getFeedbackURL()}https://developers.vtex.com${currentPage}`,
   },
 ]
 

src/components/header/index.tsx

@@ -30,6 +30,7 @@ interface Props {
 const Header = ({ isEditor }: Props) => {
   const router = useRouter()
   const isBranchPreview = router.isPreview
+  const currentPage = router.asPath.split('?')[0]
 
   const { branchPreview } = useContext(PreviewContext)
 
@@ -153,7 +154,7 @@ const Header = ({ isEditor }: Props) => {
 
           <VtexLink
             sx={styles.rightLinksItem}
-            href={getFeedbackURL()}
+            href={`${getFeedbackURL()}https://developers.vtex.com${currentPage}`}
             target="_blank"
           >
             <LongArrowIcon />

src/pages/404.tsx

@@ -8,14 +8,19 @@ import getNavigation from 'utils/getNavigation'
 import { GetStaticProps } from 'next'
 import { useContext } from 'react'
 import { PreviewContext } from 'utils/contexts/preview'
+import { getFeedbackURL } from 'utils/get-url'
+import { useRouter } from 'next/router'
 
 interface Props {
   branch: string
 }
 
 const FourOhFour: Page<Props> = ({ branch }) => {
+  const router = useRouter()
   const { setBranchPreview } = useContext(PreviewContext)
   setBranchPreview(branch)
+  const currentPage = router.asPath.split('?')[0]
+  const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}&entry.358925425=Page+not+found`
 
   return (
     <>
@@ -34,10 +39,7 @@ const FourOhFour: Page<Props> = ({ branch }) => {
               error.
             </Text>
             <Button sx={styles.button}>
-              <Link
-                sx={styles.buttonLink}
-                href="https://docs.google.com/forms/d/e/1FAIpQLSfmnotPvPjw-SjiE7lt2Nt3RQgNUe10ixXZmuO2v9enOJReoQ/viewform?entry.1972292648=developers.vtex.com&entry.1799503232="
-              >
+              <Link sx={styles.buttonLink} href={feedbackUrl}>
                 CONTACT US
               </Link>
             </Button>

src/pages/500.tsx

@@ -8,14 +8,19 @@ import { GetStaticProps } from 'next'
 import getNavigation from 'utils/getNavigation'
 import { useContext } from 'react'
 import { PreviewContext } from 'utils/contexts/preview'
+import { getFeedbackURL } from 'utils/get-url'
+import { useRouter } from 'next/router'
 
 interface Props {
   branch: string
 }
 
 const fiveHundredPage: Page<Props> = ({ branch }) => {
+  const router = useRouter()
   const { setBranchPreview } = useContext(PreviewContext)
   setBranchPreview(branch)
+  const currentPage = router.asPath.split('?')[0]
+  const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}&entry.358925425=Site+error`
 
   return (
     <>
@@ -31,10 +36,7 @@ const fiveHundredPage: Page<Props> = ({ branch }) => {
               contact us if the problem persists.
             </Text>
             <Button sx={styles.button}>
-              <Link
-                sx={styles.buttonLink}
-                href="https://docs.google.com/forms/d/e/1FAIpQLSfmnotPvPjw-SjiE7lt2Nt3RQgNUe10ixXZmuO2v9enOJReoQ/viewform?entry.1972292648=developers.vtex.com&entry.1799503232="
-              >
+              <Link sx={styles.buttonLink} href={feedbackUrl}>
                 CONTACT US
               </Link>
             </Button>

src/utils/get-url.tsx

@@ -1,5 +1,5 @@
 export const getFeedbackURL = () => {
-  return `https://docs.google.com/forms/d/e/1FAIpQLSfmnotPvPjw-SjiE7lt2Nt3RQgNUe10ixXZmuO2v9enOJReoQ/viewform?entry.1972292648=developers.vtex.com&entry.1799503232=`
+  return `https://docs.google.com/forms/d/e/1FAIpQLSejjkI4aRPadDn0C9EKa-_mESUWPjwoS6yMTN8KA9PPCLfcfA/viewform?usp=pp_url&entry.1077155995=`
 }
 
 export const getGithubURL = () => {