Skip to content

Commit

Permalink
Merge branch 'dev' into fix-incoming-call-during-a-call
Browse files Browse the repository at this point in the history
  • Loading branch information
stavares843 authored Oct 23, 2024
2 parents fa32e8c + d5e81d8 commit c9a627a
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
contents: write
issues: read
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2
- uses: delivery-much/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/automated-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
issues: read
steps:
- name: Checkout Uplink Web directory 🔖
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Checkout Automated Tests directory 🔖
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
repository: Satellite-im/automated-tests-web
path: automated-tests
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
cp -r allure/mobile-chrome/* allure-results/
- name: Get Allure history
uses: actions/[email protected].0
uses: actions/[email protected].2
if: always()
continue-on-error: true
with:
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:

steps:
- name: Checkout directory 🔖
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Delete artifacts required on failed execution
uses: geekyeggo/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/avoid-typos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
contents: write
issues: read
steps:
- name: Check out code.
uses: actions/[email protected].0
- name: Check out code
uses: actions/[email protected].2
- name: misspell
uses: reviewdog/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-release-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-linux-release:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- name: setup node
uses: actions/[email protected]
Expand All @@ -27,7 +27,7 @@ jobs:
- name: install frontend dependencies
run: npm install

- uses: tauri-apps/tauri-action@v0
- uses: tauri-apps/tauri-action@v0.5.15
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
permissions: write-all
runs-on: macos-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- name: setup node
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
permissions: write-all
runs-on: windows-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- name: setup node
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- name: setup node
uses: actions/[email protected]
Expand All @@ -39,7 +39,7 @@ jobs:
- name: install frontend dependencies
run: npm install

- uses: tauri-apps/tauri-action@v0
- uses: tauri-apps/tauri-action@v0.5.15
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
contents: write
issues: read
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- uses: actions-ecosystem/[email protected]
id: regex-match
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
issues: read
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
fetch-depth: 0 # Fetch all history for accurate comparisons

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The goal should be to build a hyper-customizable application that can run anywhe

## Quickstart for Developing

To get running fast, ensure you have this project cloned, with latest dependencies and submodules installed.
To get running fast, ensure this project is cloned, with the latest dependencies and submodules installed.

**Standard Steps:**

Expand All @@ -40,26 +40,26 @@ npm run dev

2. In Xverse, go to Settings -> General -> Network and select 'Testnet'

3. Get some free Testnet BTC from a faucet. For example: https://bitcoinfaucet.uo1.net/send.php
3. Get some free Testnet BTC from a faucet. For example https://bitcoinfaucet.uo1.net/send.php

## Get (Sepolia) Testnet Ethereum and LINK (ERC20 Token)

1. Install MetaMask Chrome extension
1. Install the MetaMask Chrome extension

2. In Metamask, Open the dropdown in the top left corner, and select Sepolia (This is the Ethereum testnet currently)
2. In Metamask, Open the dropdown in the top left corner, and select Sepolia (This is the Ethereum test net currently)

3. Go to https://faucets.chain.link and select Sepolia ETH and LINK. Press continue and paste your address.

## Request a Payment

1. While in a chat with another user in UplinkWeb, click the `Create Payment Request` button on the bottom chat bar (coin exchange icon, next to chat input).
1. While chatting with another user in UplinkWeb, click the `Create Payment Request` button on the bottom chat bar (coin exchange icon, next to chat input).

<img width="1034" alt="Captura de ecrã 2024-08-28, às 11 00 58" src="https://github.com/user-attachments/assets/5c18e3f6-80f5-4ee7-9194-13ae248dc52b">


2. Select the asset type. If selecting ETH.ERC20, you will need to put in the asset ID as well. The asset ID of LINK on Sepolia testnet is `0x779877A7B0D9E8603169DdbD7836e478b4624789` (You can see this ID in MetaMask if you own some LINK: click on it, then near the top click the '3 dots' icon, and select 'Token details'. The ID is listed under `Token contract address`).
2. Select the asset type. If selecting ETH.ERC20, you will need to put in the asset ID as well. The asset ID of LINK on Sepolia test net is `0x779877A7B0D9E8603169DdbD7836e478b4624789` (You can see this ID in MetaMask if you own some LINK: click on it, then near the top click the '3 dots' icon, and select 'Token details'. The ID is listed under `Token contract address`).

3. In UplinkWeb, once you selected the asset (and ID if applicable), enter an amount. Then click the `Request` button. A clickable message will appear in the chat. Anyone clicking this message will get a prompt via the Chrome extension to make the transfer. (Expect at least 10 seconds for a transfer to go through on the Ethereum network).
3. In UplinkWeb, once you select the asset (and ID if applicable), enter an amount. Then click the `Request` button. A clickable message will appear in the chat. Anyone clicking this message will get a prompt via the Chrome extension to make the transfer. (Expect at least 10 seconds for a transfer to go through on the Ethereum network).

## Mobile Builds

Expand Down

0 comments on commit c9a627a

Please sign in to comment.