Skip to content

Commit

Permalink
Merge branch 'master' into tracking-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
gagdiez authored Sep 27, 2024
2 parents ee4e60a + 74fed86 commit 16eb842
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@ jobs:
run: npm run start -- hello-near --frontend next-page
- name: Install
run: cd hello-near && npm install
- name: Create Frontend Components
run: npm run start -- hello-components --frontend next-page --components
- name: Install
run: cd hello-components && npm install
1 change: 1 addition & 0 deletions src/tracking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const trackUsage = async (frontend: Frontend, contract: Contract) => {
event: 'error',
properties: {
engine: process.versions.node,

os: process.platform,
},
timestamp: new Date(),
Expand Down
4 changes: 2 additions & 2 deletions templates/frontend/next-app/src/app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { useEffect, useState } from 'react';
import '@/app/globals.css';
import { NearContext } from '@/context';
import { Navigation } from '@/components/navigation';
import { NetworkId, HelloNearContract } from '@/config';
import { NetworkId } from '@/config';

import { Wallet } from '@/wallets/near';

const wallet = new Wallet({ networkId: NetworkId, createAccessKeyFor: HelloNearContract });
const wallet = new Wallet({ networkId: NetworkId });

// Layout Component
export default function RootLayout({ children }) {
Expand Down
4 changes: 2 additions & 2 deletions templates/frontend/next-page/src/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { NearContext } from '@/context';
import { Navigation } from '@/components/navigation';

import { Wallet } from '@/wallets/near';
import { NetworkId, HelloNearContract } from '@/config';
import { NetworkId } from '@/config';

const wallet = new Wallet({ createAccessKeyFor: HelloNearContract, networkId: NetworkId });
const wallet = new Wallet({ networkId: NetworkId });

export default function MyApp({ Component, pageProps }) {
const [signedAccountId, setSignedAccountId] = useState('');
Expand Down
3 changes: 2 additions & 1 deletion test/__snapshots__/user-input.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ exports[`messages snapshot basic messages 1`] = `
👋 Welcome to Near! Learn more: https://docs.near.org/
🔧 Let's get your project ready.
======================================================
(Near collects anonymous information on the commands used. No personal information that could identify you is shared)",
(Near collects anonymous information on the commands used. No personal information that could identify you is shared)
",
],
[
"==========================================
Expand Down
2 changes: 0 additions & 2 deletions test/make.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('create contract', () => {
await createProject({
contract,
frontend: 'none',
components: false,
templatesDir: rootDir,
projectPath,
});
Expand Down Expand Up @@ -60,7 +59,6 @@ describe('create frontend', () => {
await createProject({
contract: 'none',
frontend: frontend,
components: false,
templatesDir: rootDir,
projectPath,
});
Expand Down

0 comments on commit 16eb842

Please sign in to comment.