Merge branch 'main' into kai/release-package-lock

dfinity · Jun 3, 2024 · 86c64b1 · 86c64b1
2 parents 5343dc1 + 63c913d
commit 86c64b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml
@@ -11,11 +11,10 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: dfinity/conventional-pr-title-action@v2.2.3
+      - uses: dfinity/conventional-pr-title-action@v4.0.0
         with:
           success-state: Title follows the specification.
           failure-state: Title does not follow the specification.
           context-name: conventional-pr-title
-          preset: conventional-changelog-angular@latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/demos/sample-javascript/src/index.html b/demos/sample-javascript/src/index.html
@@ -5,7 +5,7 @@ <h1>Identity</h1>
       <h2>Sign In</h2>
       <div>
         <label for="idpUrl" style="display: inline-block; width: 120px">Identity Provider: </label>
-        <input type="text" id="idpUrl" value="https://identity.messaging.ic0.app/#authorize" />
+        <input type="text" id="idpUrl" value="https://identity.ic0.app/" />
       </div>
       <button id="signinBtn">Sign In</button>
       <button id="signoutBtn">Sign Out</button>
@@ -16,7 +16,7 @@ <h2>Principal:</h2>
     <div>
       <h1>Contact the IC</h1>
       <label for="hostUrl" style="display: inline-block; width: 120px">Replica URL: </label>
-      <input type="text" id="hostUrl" value="https://gw.dfinity.network/" />
+      <input type="text" id="hostUrl" value="https://icp-api.io/" />
       <br />
       <label for="canisterId" style="display: inline-block; width: 120px">Canister ID: </label>
       <input type="text" id="canisterId" value="4k2wq-cqaaa-aaaab-qac7q-cai" />

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Changed
 
 - fix: publish script will correctly update the `package-lock.json` file with the correct dependencies when making a new release
+- chore: updates agent error response to read "Gateway returns error" instead of "Server"`
+- chore: updates dfinity/conventional-pr-title-action to v4.0.0
+- chore: updates dfinity/conventional-pr-title-action to v3.2.0
 
 ## [1.3.0] - 2024-05-01
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/agent/src/agent/http/index.ts b/packages/agent/src/agent/http/index.ts
@@ -502,7 +502,7 @@ export class HttpAgent implements Agent {
         };
       } else {
         throw new AgentHTTPResponseError(
-          `Server returned an error:\n` +
+          `Gateway returned an error:\n` +
             `  Code: ${fetchResponse.status} (${fetchResponse.statusText})\n` +
             `  Body: ${await fetchResponse.text()}\n`,
           {