Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🪄 [QA] Update stage environments #772

Merged
merged 21 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/update-environments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
* Stage fork: https://stage-fork--taho-development.netlify.app/

Read more: [Deployment to Production Flow](https://github.com/tahowallet/dapp/blob/main/docs/testing-env.md)
REVIEWERS: '["andreachapman"]'
REVIEWERS: '["michalinacienciala"]'
- uses: studroid/label-pr-or-issue-action@ff48a93f6e1a8d8a6befdae900f54da173b17215 # v1.0.1
with:
pr-or-issue-number: ${{ steps.pr.outputs.PULL_REQUEST_NUMBER }}
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
* Production: https://taho-development.netlify.app/ (aka https://app.taho.xyz/)

Read more: [Deployment to Production Flow](https://github.com/tahowallet/dapp/blob/main/docs/testing-env.md)
REVIEWERS: '["andreachapman"]'
REVIEWERS: '["michalinacienciala"]'
- uses: studroid/label-pr-or-issue-action@ff48a93f6e1a8d8a6befdae900f54da173b17215 # v1.0.1
with:
pr-or-issue-number: ${{ steps.pr.outputs.PULL_REQUEST_NUMBER }}
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"stream-http": "^3.2.0",
"styled-jsx": "^5.1.2",
"use-image": "^1.1.1",
"util": "^0.12.5"
"util": "^0.12.5",
"zod": "^3.22.4"
},
"devDependencies": {
"@babel/core": "^7.22.9",
Expand Down
25 changes: 13 additions & 12 deletions src/assets/questline-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
{
"id": "4_2",
"name": "Increase your Gitcoin Passport score",
"description": "The more you increase your Gitcoin Passport score in a week, the more of the weekly XP drop you will get.",
"isNew": true
"description": "The more you increase your Gitcoin Passport score in a week, the more of the weekly XP drop you will get."
}
]
},
Expand All @@ -31,14 +30,12 @@
{
"id": "7_2",
"name": "Mint W3ST",
"description": "The more W3ST you mint, the more of the weekly XP drop you will get.",
"isNew": true
"description": "The more W3ST you mint, the more of the weekly XP drop you will get."
},
{
"id": "7_3",
"name": "Collect post essence",
"description": "The more post essence you collect, the more of the weekly XP drop you will get.",
"isNew": true
"description": "The more post essence you collect, the more of the weekly XP drop you will get."
}
]
},
Expand All @@ -51,6 +48,13 @@
"id": "8_1",
"name": "Interact with unique contracts on Base",
"description": "The more interactions you execute with different unique contracts on Base compared to other members of this realm in a week, the more of the weekly XP drop you will get."
},
{
"id": "8_2",
"name": "Vampire Attack: Bridge funds from Arbitrum",
"description": "Bridge ETH or USDC from Arbitrum to Base using Hop Exchange",
"isNew": true,
"isAttack": true
}
]
},
Expand All @@ -67,8 +71,7 @@
{
"id": "9_2",
"name": "Earn fUSDC rewards using Fluidity",
"description": "The more fUSDC rewards you earn using Fluidity in a week, the more of the weekly XP drop you will get.",
"isNew": true
"description": "The more fUSDC rewards you earn using Fluidity in a week, the more of the weekly XP drop you will get."
}
]
},
Expand All @@ -85,8 +88,7 @@
{
"id": "19_2",
"name": "Claim NFTs during the week using the Galxe space station",
"description": "The more NFTs you claim via a Galxe [`SpaceStation` contract](https://docs.galxe.com/developer/smart-contract/contracts/spacestation/), the more of the weekly XP drop you will get.",
"isNew": true
"description": "The more NFTs you claim via a Galxe [`SpaceStation` contract](https://docs.galxe.com/developer/smart-contract/contracts/spacestation/), the more of the weekly XP drop you will get."
}
]
},
Expand All @@ -103,8 +105,7 @@
{
"id": "22_2",
"name": "Bridge tokens using FraxFerry",
"description": "The more unique tokens you bridge over FraxFerry, the more of the weekly XP drop you will get.",
"isNew": true
"description": "The more unique tokens you bridge over FraxFerry, the more of the weekly XP drop you will get."
}
]
}
Expand Down
1 change: 1 addition & 0 deletions src/redux-state/selectors/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { createWalletSelector } from "redux-state/selectors"

export const selectWalletAddress = createWalletSelector("address")
export const selectWalletAvatar = createWalletSelector("avatar")
export const selectWalletAvatarType = createWalletSelector("avatarType")
export const selectWalletNameProperty = createWalletSelector("name")
export const selectIsWalletConnected = createWalletSelector("isConnected")
export const selectHasLoadedBalances = createWalletSelector("hasLoadedBalances")
Expand Down
12 changes: 11 additions & 1 deletion src/redux-state/slices/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export type WalletState = {
address: string
name: string
avatar: string
avatarType: string | null
hasLoadedBalances: boolean
balances: TokenBalances
transactionStatus: { [id: string]: TransactionProgressStatus }
Expand All @@ -19,6 +20,7 @@ const initialState: WalletState = {
address: "",
name: "",
avatar: portrait,
avatarType: null,
hasLoadedBalances: false,
balances: {
[TAHO_ADDRESS]: {
Expand All @@ -41,12 +43,20 @@ const walletSlice = createSlice({
immerState,
{
payload,
}: { payload: { address: string; name?: string; avatar?: string } }
}: {
payload: {
address: string
name?: string
avatar?: string
avatarType?: string | null
}
}
) => {
immerState.isConnected = true
immerState.address = payload.address || immerState.address
immerState.name = payload.name || immerState.name || ""
immerState.avatar = payload.avatar || immerState.avatar || portrait
immerState.avatarType = payload.avatarType || null
},
resetWalletState: () => initialState,
updateBalances: (
Expand Down
6 changes: 5 additions & 1 deletion src/redux-state/thunks/wallet.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
determineFetchedFileType,
isClaimXpTransactionID,
resolveAddressToWalletData,
} from "shared/utils"
Expand Down Expand Up @@ -35,7 +36,10 @@ export const fetchWalletName = createDappAsyncThunk(
updateConnectedWallet({
address,
...(data.name ? { name: data.name } : {}),
...(data.avatar ? { name: data.avatar } : {}),
...(data.avatar ? { avatar: data.avatar } : {}),
avatarType: data.avatar
? await determineFetchedFileType(data.avatar)
: null,
})
)

Expand Down
74 changes: 74 additions & 0 deletions src/shared/assets/attack-line.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading